diff --git a/src/checkclass.cpp b/src/checkclass.cpp
index ed9498467..6a48809db 100644
--- a/src/checkclass.cpp
+++ b/src/checkclass.cpp
@@ -221,6 +221,10 @@ void CheckClass::initializeVarList(const Token *tok1, const Token *ftok, Var *va
         if (Token::simpleMatch(ftok, "this ."))
             ftok = ftok->tokAt(2);
 
+        // Skip "classname :: "
+        if (Token::Match(ftok, "%var% ::"))
+            ftok = ftok->tokAt(2);
+
         // Clearing all variables..
         if (Token::simpleMatch(ftok, "memset ( this ,"))
         {
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 3a85255b1..3817467da 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -414,7 +414,7 @@ private:
                        "    char name[255];\n"
                        "};\n");
 
-        TODO_ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout.str());
 
         checkUninitVar("class John\n"
                        "{\n"