diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index 3b505ab4d58..a40c366e07c 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -588,7 +588,7 @@ static bool handleGTest(QFutureInterface<TestParseResultPtr> futureInterface, co
     GTestVisitor visitor(document);
     visitor.accept(ast);
 
-    QMap<GTestCaseSpec, TestCodeLocationList> result = visitor.gtestFunctions();
+    QMap<GTestCaseSpec, GTestCodeLocationList> result = visitor.gtestFunctions();
     QString proFile;
     const CppTools::CppModelManager *cppMM = CppTools::CppModelManager::instance();
     QList<CppTools::ProjectPart::Ptr> ppList = cppMM->projectPart(filePath);
@@ -605,7 +605,7 @@ static bool handleGTest(QFutureInterface<TestParseResultPtr> futureInterface, co
         parseResult->disabled = testSpec.disabled;
         parseResult->proFile = proFile;
 
-        foreach (const TestCodeLocationAndType &location, result.value(testSpec)) {
+        foreach (const GTestCodeLocationAndType &location, result.value(testSpec)) {
             GoogleTestParseResult *testSet = new GoogleTestParseResult;
             testSet->name = location.m_name;
             testSet->fileName = filePath;
diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h
index 9fe9c0081b3..26e1846b15b 100644
--- a/src/plugins/autotest/testtreeitem.h
+++ b/src/plugins/autotest/testtreeitem.h
@@ -43,7 +43,6 @@ namespace {
 namespace Autotest {
 namespace Internal {
 
-struct TestCodeLocationAndType;
 class AutoTestTreeItem;
 class QuickTestTreeItem;
 class GoogleTestTreeItem;
@@ -138,8 +137,6 @@ private:
     Status m_status;
 };
 
-typedef QVector<TestCodeLocationAndType> TestCodeLocationList;
-
 class AutoTestTreeItem : public TestTreeItem
 {
 public:
@@ -213,14 +210,24 @@ private:
     GoogleTestTreeItem::TestStates m_state;
 };
 
-struct TestCodeLocationAndType {
+class TestCodeLocationAndType
+{
+public:
     QString m_name;     // tag name for m_type == TEST_DATATAG, file name for other values
     unsigned m_line;
     unsigned m_column;
     TestTreeItem::Type m_type;
+};
+
+class GTestCodeLocationAndType : public TestCodeLocationAndType
+{
+public:
     GoogleTestTreeItem::TestStates m_state;
 };
 
+typedef QVector<TestCodeLocationAndType> TestCodeLocationList;
+typedef QVector<GTestCodeLocationAndType> GTestCodeLocationList;
+
 struct GTestCaseSpec
 {
     QString testCaseName;
diff --git a/src/plugins/autotest/testvisitor.cpp b/src/plugins/autotest/testvisitor.cpp
index 4336591e3ee..75361fe2fb6 100644
--- a/src/plugins/autotest/testvisitor.cpp
+++ b/src/plugins/autotest/testvisitor.cpp
@@ -405,7 +405,7 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
         unsigned token = id->firstToken();
         m_document->translationUnit()->getTokenStartPosition(token, &line, &column);
 
-        TestCodeLocationAndType locationAndType;
+        GTestCodeLocationAndType locationAndType;
         locationAndType.m_name = testName;
         locationAndType.m_line = line;
         locationAndType.m_column = column - 1;
diff --git a/src/plugins/autotest/testvisitor.h b/src/plugins/autotest/testvisitor.h
index f3cd9271f9e..7f096353b6f 100644
--- a/src/plugins/autotest/testvisitor.h
+++ b/src/plugins/autotest/testvisitor.h
@@ -155,12 +155,12 @@ public:
     GTestVisitor(CPlusPlus::Document::Ptr doc);
     bool visit(CPlusPlus::FunctionDefinitionAST *ast);
 
-    QMap<GTestCaseSpec, TestCodeLocationList> gtestFunctions() const { return m_gtestFunctions; }
+    QMap<GTestCaseSpec, GTestCodeLocationList> gtestFunctions() const { return m_gtestFunctions; }
 
 private:
     CPlusPlus::Document::Ptr m_document;
     CPlusPlus::Overview m_overview;
-    QMap<GTestCaseSpec, TestCodeLocationList> m_gtestFunctions;
+    QMap<GTestCaseSpec, GTestCodeLocationList> m_gtestFunctions;
 
 };