diff --git a/lib/checkboost.h b/lib/checkboost.h
index 1ac6e004a..d365a6b74 100644
--- a/lib/checkboost.h
+++ b/lib/checkboost.h
@@ -48,16 +48,22 @@ public:
         : Check(myName(), tokenizer, settings, errorLogger) {
     }
 
-    /** Simplified checks. The token list is simplified. */
-    void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
         if (!tokenizer->isCPP())
             return;
 
         CheckBoost checkBoost(tokenizer, settings, errorLogger);
-
         checkBoost.checkBoostForeachModification();
     }
 
+    /** Simplified checks. The token list is simplified. */
+    void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+        (void)tokenizer;
+        (void)settings;
+        (void)errorLogger;
+    }
+
     /** @brief %Check for container modification while using the BOOST_FOREACH macro */
     void checkBoostForeachModification();
 
diff --git a/test/testboost.cpp b/test/testboost.cpp
index f621e920e..7fabaca4a 100644
--- a/test/testboost.cpp
+++ b/test/testboost.cpp
@@ -46,11 +46,10 @@ private:
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
-        tokenizer.simplifyTokenList2();
 
         // Check..
         CheckBoost checkBoost;
-        checkBoost.runSimplifiedChecks(&tokenizer, &settings, this);
+        checkBoost.runChecks(&tokenizer, &settings, this);
     }
 
     void BoostForeachContainerModification() {