diff --git a/lib/preprocessor.h b/lib/preprocessor.h
index 738e4c218..f73aa094b 100644
--- a/lib/preprocessor.h
+++ b/lib/preprocessor.h
@@ -205,7 +205,7 @@ public:
      * @param def condition
      * @return result when evaluating the condition
      */
-    static bool match_cfg_def(const std::map<std::string, std::string> &cfg, std::string def);
+    bool match_cfg_def(const std::map<std::string, std::string> &cfg, std::string def);
 
     static void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings);
 
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index d765c9192..4825353f5 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -1002,27 +1002,29 @@ private:
 
 
     void match_cfg_def() {
+        Preprocessor preprocessor(NULL, this);
+
         {
             std::map<std::string, std::string> cfg;
-            ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A>1||defined(B)"));
+            ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A>1||defined(B)"));
         }
 
         {
             std::map<std::string, std::string> cfg;
             cfg["A"] = "";
             cfg["B"] = "";
-            ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "defined(A)&&defined(B)"));
+            ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "defined(A)&&defined(B)"));
         }
 
         {
             std::map<std::string, std::string> cfg;
             cfg["ABC"] = "";
 
-            ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "defined(A)"));
-            ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "!defined(A)"));
+            ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "defined(A)"));
+            ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "!defined(A)"));
 
-            ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "!defined(ABC)&&!defined(DEF)"));
-            ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "!defined(A)&&!defined(B)"));
+            ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "!defined(ABC)&&!defined(DEF)"));
+            ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "!defined(A)&&!defined(B)"));
         }
 
         {
@@ -1030,12 +1032,12 @@ private:
             cfg["A"] = "1";
             cfg["B"] = "2";
 
-            ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "A==1"));
-            ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "A<2"));
-            ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A==2"));
-            ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A<1"));
-            ASSERT_EQUALS(false, Preprocessor::match_cfg_def(cfg, "A>=1&&B<=A"));
-            ASSERT_EQUALS(true, Preprocessor::match_cfg_def(cfg, "A==1 && A==1"));
+            ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "A==1"));
+            ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "A<2"));
+            ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A==2"));
+            ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A<1"));
+            ASSERT_EQUALS(false, preprocessor.match_cfg_def(cfg, "A>=1&&B<=A"));
+            ASSERT_EQUALS(true, preprocessor.match_cfg_def(cfg, "A==1 && A==1"));
         }
     }