diff --git a/lib/checkstl.h b/lib/checkstl.h
index e9a582ec6..eacaf4ab6 100644
--- a/lib/checkstl.h
+++ b/lib/checkstl.h
@@ -60,6 +60,7 @@ public:
         }
 
         CheckStl checkStl(tokenizer, settings, errorLogger);
+        checkStl.missingComparison();
         checkStl.outOfBounds();
         checkStl.outOfBoundsIndexExpression();
     }
@@ -88,7 +89,6 @@ public:
         // Style check
         checkStl.size();
         checkStl.redundantCondition();
-        checkStl.missingComparison();
         checkStl.useStlAlgorithm();
     }
 
diff --git a/test/teststl.cpp b/test/teststl.cpp
index 4b103d1aa..0e8c5ac53 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -167,14 +167,19 @@ private:
         settings.inconclusive = inconclusive;
         settings.standards.cpp = cppstandard;
 
+
         // Tokenize..
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
+
+        CheckStl checkStl(&tokenizer, &settings, this);
+
         tokenizer.tokenize(istr, "test.cpp");
+        checkStl.runChecks(&tokenizer, &settings, this);
+
         tokenizer.simplifyTokenList2();
 
         // Check..
-        CheckStl checkStl(&tokenizer, &settings, this);
         checkStl.runSimplifiedChecks(&tokenizer, &settings, this);
     }
     void check(const std::string &code, const bool inconclusive=false) {