diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 729d26ec7c7..7f18d386c4a 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -25,11 +25,11 @@
 
 #include "clangcodemodelplugin.h"
 
-#include "clangbatchfileprocessor.h"
 #include "clangconstants.h"
 #include "clangprojectsettingswidget.h"
 
 #ifdef WITH_TESTS
+#  include "test/clangbatchfileprocessor.h"
 #  include "test/clangcodecompletion_test.h"
 #endif
 
diff --git a/src/plugins/clangcodemodel/clangautomationutils.cpp b/src/plugins/clangcodemodel/test/clangautomationutils.cpp
similarity index 98%
rename from src/plugins/clangcodemodel/clangautomationutils.cpp
rename to src/plugins/clangcodemodel/test/clangautomationutils.cpp
index 29dc1c71553..e0bc59e2f3c 100644
--- a/src/plugins/clangcodemodel/clangautomationutils.cpp
+++ b/src/plugins/clangcodemodel/test/clangautomationutils.cpp
@@ -25,8 +25,8 @@
 
 #include "clangautomationutils.h"
 
-#include "clangcompletionassistinterface.h"
-#include "clangcompletionassistprovider.h"
+#include "../clangcompletionassistinterface.h"
+#include "../clangcompletionassistprovider.h"
 
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/assistproposalitem.h>
diff --git a/src/plugins/clangcodemodel/clangautomationutils.h b/src/plugins/clangcodemodel/test/clangautomationutils.h
similarity index 100%
rename from src/plugins/clangcodemodel/clangautomationutils.h
rename to src/plugins/clangcodemodel/test/clangautomationutils.h
diff --git a/src/plugins/clangcodemodel/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
similarity index 100%
rename from src/plugins/clangcodemodel/clangbatchfileprocessor.cpp
rename to src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
diff --git a/src/plugins/clangcodemodel/clangbatchfileprocessor.h b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
similarity index 100%
rename from src/plugins/clangcodemodel/clangbatchfileprocessor.h
rename to src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index f5072068f6a..9d2008662f9 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -25,7 +25,7 @@
 
 #include "clangcodecompletion_test.h"
 
-#include "../clangautomationutils.h"
+#include "clangautomationutils.h"
 #include "../clangbackendipcintegration.h"
 #include "../clangcompletionassistinterface.h"
 #include "../clangmodelmanagersupport.h"