diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index 5f7b6f04d78339f1ec94ca4d559dd301a2039245..bc807c7f6ca92acae79c38c079b653007dd491b6 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -787,7 +787,11 @@ void CheckSymbols::checkName(NameAST *ast, Scope *scope)
                 }
             }
         } else if (maybeType(ast->name) || maybeStatic(ast->name)) {
-            maybeAddTypeOrStatic(_context.lookup(ast->name, scope), ast);
+            if (! maybeAddTypeOrStatic(_context.lookup(ast->name, scope), ast)) {
+                // it can be a local variable
+                if (maybeField(ast->name))
+                    maybeAddField(_context.lookup(ast->name, scope), ast);
+            }
         } else if (maybeField(ast->name)) {
             maybeAddField(_context.lookup(ast->name, scope), ast);
         }
diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
index ac586b75d85fd197cb3fd5d29e531f8b60bc5959..941118a18ec6af52e7bb73d3025132fc096454e6 100644
--- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
+++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
@@ -183,6 +183,7 @@ private slots:
     void test_checksymbols_FunctionUse();
     void test_checksymbols_PseudoKeywordUse();
     void test_checksymbols_StaticUse();
+    void test_checksymbols_VariableHasTheSameNameAsEnumUse();
 };
 
 void tst_CheckSymbols::test_checksymbols_TypeUse()
@@ -377,5 +378,35 @@ void tst_CheckSymbols::test_checksymbols_StaticUse()
     TestData::check(source, expectedUses);
 }
 
+void tst_CheckSymbols::test_checksymbols_VariableHasTheSameNameAsEnumUse()
+{
+    const QByteArray source =
+            "struct Foo\n"
+            "{\n"
+            "    enum E { bar, baz };\n"
+            "};\n"
+            "\n"
+            "struct Boo\n"
+            "{\n"
+            "    int foo;\n"
+            "    int bar;\n"
+            "    int baz;\n"
+            "};\n"
+            ;
+    const QList<Use> expectedUses = QList<Use>()
+            << Use(1, 8, 3, SemanticInfo::TypeUse)
+            << Use(3, 19, 3, SemanticInfo::EnumerationUse)
+            << Use(3, 14, 3, SemanticInfo::EnumerationUse)
+            << Use(3, 10, 1, SemanticInfo::TypeUse)
+            << Use(6, 8, 3, SemanticInfo::TypeUse)
+            << Use(8, 9, 3, SemanticInfo::FieldUse)
+            << Use(9, 9, 3, SemanticInfo::FieldUse)
+            << Use(10, 9, 3, SemanticInfo::FieldUse)
+               ;
+
+    TestData::check(source, expectedUses);
+}
+
+
 QTEST_APPLESS_MAIN(tst_CheckSymbols)
 #include "tst_checksymbols.moc"