diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro
index 237f26b1f85..e8578cbb7cf 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -115,23 +115,14 @@ contains(DEFINES, CLANG_INDEXING) {
 FORMS += clangprojectsettingspropertiespage.ui
 
 equals(TEST, 1) {
-    RESOURCES += \
-        test/clang_tests_database.qrc
-
     HEADERS += \
         test/clangcodecompletion_test.h
 
     SOURCES += \
         test/clangcodecompletion_test.cpp
 
-    DISTFILES += \
-        test/mysource.cpp \
-        test/myheader.cpp \
-        test/completionWithProject.cpp \
-        test/memberCompletion.cpp \
-        test/doxygenKeywordsCompletion.cpp \
-        test/preprocessorKeywordsCompletion.cpp \
-        test/includeDirectiveCompletion.cpp
+    RESOURCES += test/data/clangtestdata.qrc
+    OTHER_FILES += $$files(test/data/*)
 }
 
 macx {
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index 311bf9cb283..858903aa776 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -104,7 +104,7 @@ QtcPlugin {
         condition: project.testsEnabled
         prefix: "test/"
         files: [
-            "clang_tests_database.qrc",
+            "data/clangtestdata.qrc",
             "clangcodecompletion_test.cpp",
             "clangcodecompletion_test.h",
         ]
@@ -112,20 +112,10 @@ QtcPlugin {
 
     Group {
         name: "Test resources"
-        prefix: "test/"
+        prefix: "test/data/"
         fileTags: "none"
-        files: [
-            "mysource.cpp",
-            "myheader.h",
-            "completionWithProject.cpp",
-            "memberCompletion.cpp",
-            "doxygenKeywordsCompletion.cpp",
-            "preprocessorKeywordsCompletion.cpp",
-            "includeDirectiveCompletion.cpp",
-            "objc_messages_1.mm",
-            "objc_messages_2.mm",
-            "objc_messages_3.mm",
-        ]
+        files: [ "*" ]
+        excludeFiles: "clangtestdata.qrc"
     }
 
     files: [
diff --git a/src/plugins/clangcodemodel/test/clang_tests_database.qrc b/src/plugins/clangcodemodel/test/data/clangtestdata.qrc
similarity index 100%
rename from src/plugins/clangcodemodel/test/clang_tests_database.qrc
rename to src/plugins/clangcodemodel/test/data/clangtestdata.qrc
index aeda67e4342..429b59eae8d 100644
--- a/src/plugins/clangcodemodel/test/clang_tests_database.qrc
+++ b/src/plugins/clangcodemodel/test/data/clangtestdata.qrc
@@ -1,25 +1,25 @@
 <RCC>
     <qresource prefix="/unittests/ClangCodeModel">
-        <file>objc_messages_1.mm</file>
-        <file>objc_messages_2.mm</file>
-        <file>objc_messages_3.mm</file>
-        <file>completionWithProject.cpp</file>
-        <file>memberCompletion.cpp</file>
-        <file>myheader.h</file>
-        <file>mysource.cpp</file>
         <file>qt-widgets-app/main.cpp</file>
         <file>qt-widgets-app/mainwindow.cpp</file>
         <file>qt-widgets-app/mainwindow.h</file>
         <file>qt-widgets-app/mainwindow.ui</file>
         <file>qt-widgets-app/qt-widgets-app.pro</file>
-        <file>functionCompletion.cpp</file>
-        <file>doxygenKeywordsCompletion.cpp</file>
-        <file>preprocessorKeywordsCompletion.cpp</file>
-        <file>includeDirectiveCompletion.cpp</file>
         <file>exampleIncludeDir/file.h</file>
-        <file>exampleIncludeDir/otherFile.h</file>
         <file>exampleIncludeDir/mylib/mylib.h</file>
-        <file>globalCompletion.cpp</file>
+        <file>exampleIncludeDir/otherFile.h</file>
+        <file>completionWithProject.cpp</file>
         <file>constructorCompletion.cpp</file>
+        <file>doxygenKeywordsCompletion.cpp</file>
+        <file>functionCompletion.cpp</file>
+        <file>globalCompletion.cpp</file>
+        <file>includeDirectiveCompletion.cpp</file>
+        <file>memberCompletion.cpp</file>
+        <file>myheader.h</file>
+        <file>mysource.cpp</file>
+        <file>objc_messages_1.mm</file>
+        <file>objc_messages_2.mm</file>
+        <file>objc_messages_3.mm</file>
+        <file>preprocessorKeywordsCompletion.cpp</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/clangcodemodel/test/completionWithProject.cpp b/src/plugins/clangcodemodel/test/data/completionWithProject.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/completionWithProject.cpp
rename to src/plugins/clangcodemodel/test/data/completionWithProject.cpp
diff --git a/src/plugins/clangcodemodel/test/constructorCompletion.cpp b/src/plugins/clangcodemodel/test/data/constructorCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/constructorCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/constructorCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/doxygenKeywordsCompletion.cpp b/src/plugins/clangcodemodel/test/data/doxygenKeywordsCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/doxygenKeywordsCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/doxygenKeywordsCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/exampleIncludeDir/file.h b/src/plugins/clangcodemodel/test/data/exampleIncludeDir/file.h
similarity index 100%
rename from src/plugins/clangcodemodel/test/exampleIncludeDir/file.h
rename to src/plugins/clangcodemodel/test/data/exampleIncludeDir/file.h
diff --git a/src/plugins/clangcodemodel/test/exampleIncludeDir/mylib/mylib.h b/src/plugins/clangcodemodel/test/data/exampleIncludeDir/mylib/mylib.h
similarity index 100%
rename from src/plugins/clangcodemodel/test/exampleIncludeDir/mylib/mylib.h
rename to src/plugins/clangcodemodel/test/data/exampleIncludeDir/mylib/mylib.h
diff --git a/src/plugins/clangcodemodel/test/exampleIncludeDir/otherFile.h b/src/plugins/clangcodemodel/test/data/exampleIncludeDir/otherFile.h
similarity index 100%
rename from src/plugins/clangcodemodel/test/exampleIncludeDir/otherFile.h
rename to src/plugins/clangcodemodel/test/data/exampleIncludeDir/otherFile.h
diff --git a/src/plugins/clangcodemodel/test/functionCompletion.cpp b/src/plugins/clangcodemodel/test/data/functionCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/functionCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/functionCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/globalCompletion.cpp b/src/plugins/clangcodemodel/test/data/globalCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/globalCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/globalCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/includeDirectiveCompletion.cpp b/src/plugins/clangcodemodel/test/data/includeDirectiveCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/includeDirectiveCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/includeDirectiveCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/memberCompletion.cpp b/src/plugins/clangcodemodel/test/data/memberCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/memberCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/memberCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/myheader.h b/src/plugins/clangcodemodel/test/data/myheader.h
similarity index 100%
rename from src/plugins/clangcodemodel/test/myheader.h
rename to src/plugins/clangcodemodel/test/data/myheader.h
diff --git a/src/plugins/clangcodemodel/test/mysource.cpp b/src/plugins/clangcodemodel/test/data/mysource.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/mysource.cpp
rename to src/plugins/clangcodemodel/test/data/mysource.cpp
diff --git a/src/plugins/clangcodemodel/test/objc_messages_1.mm b/src/plugins/clangcodemodel/test/data/objc_messages_1.mm
similarity index 100%
rename from src/plugins/clangcodemodel/test/objc_messages_1.mm
rename to src/plugins/clangcodemodel/test/data/objc_messages_1.mm
diff --git a/src/plugins/clangcodemodel/test/objc_messages_2.mm b/src/plugins/clangcodemodel/test/data/objc_messages_2.mm
similarity index 100%
rename from src/plugins/clangcodemodel/test/objc_messages_2.mm
rename to src/plugins/clangcodemodel/test/data/objc_messages_2.mm
diff --git a/src/plugins/clangcodemodel/test/objc_messages_3.mm b/src/plugins/clangcodemodel/test/data/objc_messages_3.mm
similarity index 100%
rename from src/plugins/clangcodemodel/test/objc_messages_3.mm
rename to src/plugins/clangcodemodel/test/data/objc_messages_3.mm
diff --git a/src/plugins/clangcodemodel/test/preprocessorKeywordsCompletion.cpp b/src/plugins/clangcodemodel/test/data/preprocessorKeywordsCompletion.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/preprocessorKeywordsCompletion.cpp
rename to src/plugins/clangcodemodel/test/data/preprocessorKeywordsCompletion.cpp
diff --git a/src/plugins/clangcodemodel/test/qt-widgets-app/main.cpp b/src/plugins/clangcodemodel/test/data/qt-widgets-app/main.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/qt-widgets-app/main.cpp
rename to src/plugins/clangcodemodel/test/data/qt-widgets-app/main.cpp
diff --git a/src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.cpp b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.cpp
rename to src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.cpp
diff --git a/src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.h b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h
similarity index 100%
rename from src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.h
rename to src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h
diff --git a/src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.ui b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.ui
similarity index 100%
rename from src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.ui
rename to src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.ui
diff --git a/src/plugins/clangcodemodel/test/qt-widgets-app/qt-widgets-app.pro b/src/plugins/clangcodemodel/test/data/qt-widgets-app/qt-widgets-app.pro
similarity index 100%
rename from src/plugins/clangcodemodel/test/qt-widgets-app/qt-widgets-app.pro
rename to src/plugins/clangcodemodel/test/data/qt-widgets-app/qt-widgets-app.pro