diff --git a/tests/acceptance/tests/basic_dsc_resources/waitforall/negative/waitforall_blacklist.rb b/tests/acceptance/tests/basic_dsc_resources/waitforall/negative/waitforall_blacklist.rb
index 62e7694f0..41abb1573 100755
--- a/tests/acceptance/tests/basic_dsc_resources/waitforall/negative/waitforall_blacklist.rb
+++ b/tests/acceptance/tests/basic_dsc_resources/waitforall/negative/waitforall_blacklist.rb
@@ -23,9 +23,7 @@
 # Tests
 agents.each do |agent|
   step 'Attempt to Apply Manifest'
-  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 0) do |result|
-    expect_failure('Expected to fail because of MODULES-2504') do
-      assert_match(error_msg, result.stderr, 'Expected error was not detected!')
-    end
+  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 1) do |result|
+    assert_match(error_msg, result.stderr, 'Expected error was not detected!')
   end
 end
diff --git a/tests/acceptance/tests/basic_dsc_resources/waitforany/negative/waitforany_blacklist.rb b/tests/acceptance/tests/basic_dsc_resources/waitforany/negative/waitforany_blacklist.rb
index 9eeb2bb9e..96fce8ad8 100755
--- a/tests/acceptance/tests/basic_dsc_resources/waitforany/negative/waitforany_blacklist.rb
+++ b/tests/acceptance/tests/basic_dsc_resources/waitforany/negative/waitforany_blacklist.rb
@@ -23,9 +23,7 @@
 # Tests
 agents.each do |agent|
   step 'Attempt to Apply Manifest'
-  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 0) do |result|
-    expect_failure('Expected to fail because of MODULES-2504') do
-      assert_match(error_msg, result.stderr, 'Expected error was not detected!')
-    end
+  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 1) do |result|
+    assert_match(error_msg, result.stderr, 'Expected error was not detected!')
   end
 end
diff --git a/tests/acceptance/tests/basic_dsc_resources/waitforsome/negative/waitforsome_blacklist.rb b/tests/acceptance/tests/basic_dsc_resources/waitforsome/negative/waitforsome_blacklist.rb
index b518891ce..152fb5e87 100755
--- a/tests/acceptance/tests/basic_dsc_resources/waitforsome/negative/waitforsome_blacklist.rb
+++ b/tests/acceptance/tests/basic_dsc_resources/waitforsome/negative/waitforsome_blacklist.rb
@@ -23,9 +23,7 @@
 # Tests
 agents.each do |agent|
   step 'Attempt to Apply Manifest'
-  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 0) do |result|
-    expect_failure('Expected to fail because of MODULES-2504') do
-      assert_match(error_msg, result.stderr, 'Expected error was not detected!')
-    end
+  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 1) do |result|
+    assert_match(error_msg, result.stderr, 'Expected error was not detected!')
   end
 end