diff --git a/test/fixture.cpp b/test/fixture.cpp
index 138239146..e415de479 100644
--- a/test/fixture.cpp
+++ b/test/fixture.cpp
@@ -380,7 +380,7 @@ std::size_t TestFixture::runTests(const options& args)
         std::cerr << std::endl << std::endl;
     }
     std::cerr.flush();
-    return fails_counter;
+    return fails_counter + succeeded_todos_counter;
 }
 
 void TestFixture::reportOut(const std::string & outmsg, Color /*c*/)
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 3edddf773..49394f5ec 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -3762,13 +3762,11 @@ private:
               "        std::cout << abc << p;\n"
               "    }\n"
               "}", false);
-        TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:5]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:6]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n",
-                           "[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n",
-                           errout.str());
+        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
+                      "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
+                      "[test.cpp:2] -> [test.cpp:5]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
+                      "[test.cpp:2] -> [test.cpp:6]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n",
+                      errout.str());
 
         check("void f() {\n"
               "    void* p1 = 0;\n"