diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp
index fe0b3db70c6..162fed7ec35 100644
--- a/src/plugins/autotest/qtest/qttestparser.cpp
+++ b/src/plugins/autotest/qtest/qttestparser.cpp
@@ -180,7 +180,7 @@ static QSet<QString> filesWithDataFunctionDefinitions(
     return result;
 }
 
-static QMap<QString, QtTestCodeLocationList> checkForDataTags(const QString &fileName,
+static QHash<QString, QtTestCodeLocationList> checkForDataTags(const QString &fileName,
             const CPlusPlus::Snapshot &snapshot)
 {
     const QByteArray fileContent = CppParser::getFileContent(fileName);
@@ -256,13 +256,13 @@ static void fetchAndMergeBaseTestFunctions(const QSet<QString> &baseClasses,
 }
 
 static QtTestCodeLocationList tagLocationsFor(const QtTestParseResult *func,
-                                              const QMap<QString, QtTestCodeLocationList> &dataTags)
+                                              const QHash<QString, QtTestCodeLocationList> &dataTags)
 {
     if (!func->inherited())
         return dataTags.value(func->name);
 
-    QMap<QString, QtTestCodeLocationList>::ConstIterator it = dataTags.begin();
-    QMap<QString, QtTestCodeLocationList>::ConstIterator end = dataTags.end();
+    QHash<QString, QtTestCodeLocationList>::ConstIterator it = dataTags.begin();
+    QHash<QString, QtTestCodeLocationList>::ConstIterator end = dataTags.end();
     const int lastColon = func->name.lastIndexOf(':');
     QString funcName = lastColon == -1 ? func->name : func->name.mid(lastColon - 1);
     for ( ; it != end; ++it) {
@@ -317,8 +317,7 @@ static bool handleQtTest(QFutureInterface<TestParseResultPtr> futureInterface,
 
         const QSet<QString> &files = filesWithDataFunctionDefinitions(testFunctions);
 
-        // TODO: change to QHash<>
-        QMap<QString, QtTestCodeLocationList> dataTags;
+        QHash<QString, QtTestCodeLocationList> dataTags;
         for (const QString &file : files)
             dataTags.unite(checkForDataTags(file, snapshot));
 
diff --git a/src/plugins/autotest/qtest/qttestvisitors.h b/src/plugins/autotest/qtest/qttestvisitors.h
index 82091192493..3bd0c565288 100644
--- a/src/plugins/autotest/qtest/qttestvisitors.h
+++ b/src/plugins/autotest/qtest/qttestvisitors.h
@@ -89,7 +89,7 @@ public:
     bool visit(CPlusPlus::CallAST *ast) override;
     bool preVisit(CPlusPlus::AST *ast) override;
     void postVisit(CPlusPlus::AST *ast) override;
-    QMap<QString, QtTestCodeLocationList> dataTags() const { return m_dataTags; }
+    QHash<QString, QtTestCodeLocationList> dataTags() const { return m_dataTags; }
 
 private:
     QString extractNameFromAST(CPlusPlus::StringLiteralAST *ast, bool *ok) const;
@@ -98,7 +98,7 @@ private:
     CPlusPlus::Document::Ptr m_currentDoc;
     CPlusPlus::Overview m_overview;
     QString m_currentFunction;
-    QMap<QString, QtTestCodeLocationList> m_dataTags;
+    QHash<QString, QtTestCodeLocationList> m_dataTags;
     QtTestCodeLocationList m_currentTags;
     unsigned m_currentAstDepth = 0;
     unsigned m_insideUsingQTestDepth = 0;