diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
index 14cf9fc83..2999e1441 100644
--- a/lib/checkexceptionsafety.h
+++ b/lib/checkexceptionsafety.h
@@ -61,8 +61,7 @@ public:
         : Check(myName(), tokenizer, settings, errorLogger) {
     }
 
-    /** Checks that uses the simplified token list */
-    void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
         if (tokenizer->isC())
             return;
 
@@ -75,6 +74,12 @@ public:
         checkExceptionSafety.unhandledExceptionSpecification();
     }
 
+    void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+        (void)tokenizer;
+        (void)settings;
+        (void)errorLogger;
+    }
+
     /** Don't throw exceptions in destructors */
     void destructors();
 
diff --git a/test/testbool.cpp b/test/testbool.cpp
index d853c7bc3..a83a3f306 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -82,8 +82,6 @@ private:
         // Check...
         CheckBool checkBool(&tokenizer, &settings, this);
         checkBool.runChecks(&tokenizer, &settings, this);
-        tokenizer.simplifyTokenList2();
-        checkBool.runSimplifiedChecks(&tokenizer, &settings, this);
     }
 
 
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index 05a5dc7f8..dd18daeaa 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -54,8 +54,6 @@ private:
         // Check for buffer overruns..
         CheckBufferOverrun checkBufferOverrun;
         checkBufferOverrun.runChecks(&tokenizer, &settings0, this);
-        tokenizer.simplifyTokenList2();
-        checkBufferOverrun.runSimplifiedChecks(&tokenizer, &settings0, this);
     }
 
     void check(const char code[], const Settings &settings, const char filename[] = "test.cpp") {
@@ -69,8 +67,6 @@ private:
         // Check for buffer overruns..
         CheckBufferOverrun checkBufferOverrun(&tokenizer, &settings, this);
         checkBufferOverrun.runChecks(&tokenizer, &settings, this);
-        tokenizer.simplifyTokenList2();
-        checkBufferOverrun.runSimplifiedChecks(&tokenizer, &settings, this);
     }
 
     void run() OVERRIDE {
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index 2467c44ba..fd25ab3f0 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -140,8 +140,6 @@ private:
         // Run checks..
         CheckCondition checkCondition;
         checkCondition.runChecks(&tokenizer, &settings0, this);
-        tokenizer.simplifyTokenList2();
-        checkCondition.runSimplifiedChecks(&tokenizer, &settings0, this);
     }
 
     void assignAndCompare() {
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 78e861d15..9e5519bf7 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -66,7 +66,7 @@ private:
 
         // Check char variable usage..
         CheckExceptionSafety checkExceptionSafety(&tokenizer, &settings, this);
-        checkExceptionSafety.runSimplifiedChecks(&tokenizer, &settings, this);
+        checkExceptionSafety.runChecks(&tokenizer, &settings, this);
     }
 
     void destructors() {