diff --git a/rakefile_helper.rb b/rakefile_helper.rb
index cbeecb8..7f3f2ae 100644
--- a/rakefile_helper.rb
+++ b/rakefile_helper.rb
@@ -254,7 +254,7 @@ module RakefileHelpers
       tests.each_with_index do |test, index|
         # compare test's intended pass/fail state with pass/fail state in actual results;
         # if they don't match, the system test has failed
-        if (test[:pass] != !((test_results =~ /test#{index+1}::: PASS/).nil?))
+        if ((test[:pass] and (test_results =~ /:PASS/).nil?) or (!test[:pass] and (test_results =~ /:FAIL/).nil?))
           total_failures += 1
           test_results =~ /test#{index+1}:(.+)/
           failure_messages << "#{test_file}:test#{index+1}:should #{test[:should]}:#{$1}"
diff --git a/test/c/TestCMockCDynamic_Runner.c b/test/c/TestCMockCDynamic_Runner.c
index cd04b8c..055adc8 100644
--- a/test/c/TestCMockCDynamic_Runner.c
+++ b/test/c/TestCMockCDynamic_Runner.c
@@ -28,12 +28,12 @@ int main(void)
   UnityBegin();
 
   // RUN_TEST calls runTest
-  RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes);
-  RUN_TEST(test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize);
-  RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation);
-  RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot);
-  RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether);
-  RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes);
+  RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 20);
+  RUN_TEST(test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize, 29);
+  RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 39);
+  RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot, 53);
+  RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether, 64);
+  RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes, 146);
 
   UnityEnd();
 
diff --git a/test/c/TestCMockC_Runner.c b/test/c/TestCMockC_Runner.c
index 5bdc5cb..272d446 100644
--- a/test/c/TestCMockC_Runner.c
+++ b/test/c/TestCMockC_Runner.c
@@ -29,13 +29,13 @@ int main(void)
   UnityBegin();
 
   // RUN_TEST calls runTest
-  RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes);
-  RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation);
-  RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot);
-  RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether);
-  RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenItRunsOutOfMemory);
-  RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenAskForMoreThanItHasLeftEvenIfNotAtExactEnd);
-  RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes);
+  RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 15);
+  RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 25);
+  RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot, 39);
+  RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether, 50);
+  RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenItRunsOutOfMemory, 132);
+  RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenAskForMoreThanItHasLeftEvenIfNotAtExactEnd, 178);
+  RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes, 225);
 
   UnityEnd();