diff --git a/src/plugins/clangstaticanalyzer/tests/tests.pri b/src/plugins/clangstaticanalyzer/tests/tests.pri
deleted file mode 100644
index 8975fc8448df84e945c9c486947bef50e23e0489..0000000000000000000000000000000000000000
--- a/src/plugins/clangstaticanalyzer/tests/tests.pri
+++ /dev/null
@@ -1,22 +0,0 @@
-QTC_LIB_DEPENDS += utils
-QTC_PLUGIN_DEPENDS += analyzerbase
-
-isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE=$$(QTC_SOURCE)
-isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE=$$(QTC_BUILD)
-isEmpty(IDE_SOURCE_TREE): error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE): error(Set QTC_BUILD environment variable)
-
-PLUGINDIR = $$PWD/..
-INCLUDEPATH += $$PLUGINDIR/..
-
-include($$IDE_SOURCE_TREE/qtcreator.pri)
-include($$IDE_SOURCE_TREE/tests/auto/qttestrpath.pri)
-
-QT       += testlib
-QT       -= gui
-
-CONFIG   += console
-CONFIG   += testcase
-CONFIG   -= app_bundle
-
-TEMPLATE = app
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 229f962899243ad0f6084ecbe4d975ed1723f717..1d036116ebf3cb046d36bb3a50fb88f09bd1d2c2 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -3,6 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
     aggregation \
     changeset \
+    clangstaticanalyzer \
     cplusplus \
     debugger \
     diff \
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
index 27a19798a8977b2ba8a7a42a0180f55e1896b67c..6b1b308442756e73113769b292fe3eb4714fece6 100644
--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -6,6 +6,7 @@ Project {
     references: [
         "aggregation/aggregation.qbs",
         "changeset/changeset.qbs",
+        "clangstaticanalyzer/clangstaticanalyzer.qbs",
         "cplusplus/cplusplus.qbs",
         "debugger/debugger.qbs",
         "diff/diff.qbs",
diff --git a/src/plugins/clangstaticanalyzer/tests/tests.pro b/tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/tests.pro
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro
diff --git a/src/plugins/clangstaticanalyzer/tests/tests.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
similarity index 75%
rename from src/plugins/clangstaticanalyzer/tests/tests.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
index a6dc94d66cf09a4cfadbc4c9a34e5313eb398296..e9ee45d733a7162f94f60804c9f30fa029ea6c51 100644
--- a/src/plugins/clangstaticanalyzer/tests/tests.qbs
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
@@ -1,6 +1,7 @@
 import qbs
 
 Project {
+    name: "ClangStaticAnalyzer autotests"
     references: [
         "clangstaticanalyzerlogfilereader",
         "clangstaticanalyzerrunner",
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerautotest.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
similarity index 73%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerautotest.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
index 88dfcb32a138713b31e4f2543039f5905f489fde..2baf9b8c7fd95ff6a96467925014582938ab418f 100644
--- a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerautotest.qbs
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
@@ -5,7 +5,7 @@ QtcAutotest {
     Depends { name: "AnalyzerBase" }
     Depends { name: "Utils" }
 
-    property path pluginDir: "../../"
+    property path pluginDir: project.ide_source_tree + "/src/plugins/clangstaticanalyzer"
     cpp.defines: base.concat('SRCDIR="' + sourceDirectory + '"')
     cpp.includePaths: base.concat(pluginDir + "/..")
 }
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
similarity index 90%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
index d9dda64f85d69012c909ea7e16669ad3081ae11b..4a1f96e77f777c3c25923baf338fb73194cb948d 100644
--- a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
@@ -1,4 +1,4 @@
-include(../tests.pri)
+include(../clangstaticanalyzertest.pri)
 
 TARGET = tst_clangstaticanalyzerlogfilereader
 
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
similarity index 85%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
index b19bae409288cb7c7411a46188508584f87a114b..1331b22103b53dbb1f6435ce3bd2f4190fe16bf1 100644
--- a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
@@ -1,4 +1,4 @@
-include(../tests.pri)
+include(../clangstaticanalyzertest.pri)
 
 TARGET = tst_clangstaticanalyzerrunnertest
 
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri b/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
new file mode 100644
index 0000000000000000000000000000000000000000..e09c2e7fc6af757a032e01689e6598555ec62833
--- /dev/null
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
@@ -0,0 +1,5 @@
+QTC_LIB_DEPENDS += utils
+QTC_PLUGIN_DEPENDS += analyzerbase
+include(../qttest.pri)
+
+PLUGINDIR=$$IDE_SOURCE_TREE/src/plugins/clangstaticanalyzer