diff --git a/tests/auto/autotest.qbs b/qbs/imports/QtcAutotest.qbs
similarity index 100%
rename from tests/auto/autotest.qbs
rename to qbs/imports/QtcAutotest.qbs
diff --git a/tests/auto/aggregation/aggregation.qbs b/tests/auto/aggregation/aggregation.qbs
index e1dc9c8fe11922d1cacb397abf73eaf38d3633dc..e8945b95cffc168cb659267e77ad4d8826e6f2a0 100644
--- a/tests/auto/aggregation/aggregation.qbs
+++ b/tests/auto/aggregation/aggregation.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Aggregation autotest"
     Depends { name: "Aggregation" }
     files: "tst_aggregate.cpp"
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
index 07d8f63d234ad90e633d3573ab7782616a10948c..b427ed710be6c05c70b9f3e84136bddbda259e63 100644
--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -1,7 +1,7 @@
 import qbs
 
 Project {
-    name: "Autotests"
+    name: "QtcAutotests"
     condition: project.withAutotests
     references: [
         "aggregation/aggregation.qbs",
diff --git a/tests/auto/changeset/changeset.qbs b/tests/auto/changeset/changeset.qbs
index f1f8f00cf2cd2a2547c96caab31f239fc557f417..fe4e52aa9b4ce6fc030b097bed05e948704b003a 100644
--- a/tests/auto/changeset/changeset.qbs
+++ b/tests/auto/changeset/changeset.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "ChangeSet autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.gui" } // TODO: Remove once qbs bug is fixed.
diff --git a/tests/auto/cplusplus/cplusplusautotest.qbs b/tests/auto/cplusplus/cplusplusautotest.qbs
index 487f02128c31ce36575eb98841f0064ddd891632..4c8c640db5fe91f43927471f0a81a4e2ad3032a3 100644
--- a/tests/auto/cplusplus/cplusplusautotest.qbs
+++ b/tests/auto/cplusplus/cplusplusautotest.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     Depends { name: "CppTools" }
     Depends { name: "TextEditor" }
     Depends { name: "Utils" }
diff --git a/tests/auto/debugger/disassembler.qbs b/tests/auto/debugger/disassembler.qbs
index 94245181b10c4d68af98ad2be07775f8d6d6dad5..b228c90d14c8e0cf30139655cdc3ef9cc084b2b2 100644
--- a/tests/auto/debugger/disassembler.qbs
+++ b/tests/auto/debugger/disassembler.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "disassembler autotest"
     Depends { name: "Qt.network" } // For QHostAddress
     Group {
diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs
index aa084b1ed6146a44a111284df8052d23d332cabc..2ca6226fbc42b06154b333b12616bc36afc4538f 100644
--- a/tests/auto/debugger/dumpers.qbs
+++ b/tests/auto/debugger/dumpers.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Debugger dumpers autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.network" } // For QHostAddress
diff --git a/tests/auto/debugger/gdb.qbs b/tests/auto/debugger/gdb.qbs
index 159729652a27a94a40fc32bb379e7254e3a51c8b..3a202fc765a2433cedf1066c944da77459b561ec 100644
--- a/tests/auto/debugger/gdb.qbs
+++ b/tests/auto/debugger/gdb.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "gdb autotest"
     Depends { name: "Qt.network" } // For QHostAddress
     Group {
diff --git a/tests/auto/debugger/namedemangler.qbs b/tests/auto/debugger/namedemangler.qbs
index c7e03a5cdd161302b7055ce04f8d361b5aaec86d..252c17e28d62fa661889f3fa6e1a3891fe242a01 100644
--- a/tests/auto/debugger/namedemangler.qbs
+++ b/tests/auto/debugger/namedemangler.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Name demangler autotest"
     Group {
         name: "Sources from Debugger plugin"
diff --git a/tests/auto/debugger/simplifytypes.qbs b/tests/auto/debugger/simplifytypes.qbs
index f766bbcf974093378c4be48413860c25b47d3efd..e81d5a42ff08411b36de3caaa5fa1c39826bbae3 100644
--- a/tests/auto/debugger/simplifytypes.qbs
+++ b/tests/auto/debugger/simplifytypes.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "simplifytypes autotest"
     Depends { name: "Qt.network" } // For QHostAddress
     Group {
diff --git a/tests/auto/diff/differ/differ.qbs b/tests/auto/diff/differ/differ.qbs
index 2f678a6e1f1bd4906b35c96edc8cdd9995fd645c..c3edbdb9d61dfcad142bf18aa260bc5d95d50a38 100644
--- a/tests/auto/diff/differ/differ.qbs
+++ b/tests/auto/diff/differ/differ.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Differ autotest"
     Depends { name: "DiffEditor" }
     Depends { name: "Qt.widgets" } // For QTextDocument
diff --git a/tests/auto/environment/environment.qbs b/tests/auto/environment/environment.qbs
index b169e290d83b0f7ecf78c44c8d58e2cc6e229e1c..71a8f792168a65d8afc8dea2373c98c7da8e84ac 100644
--- a/tests/auto/environment/environment.qbs
+++ b/tests/auto/environment/environment.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Environment autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
diff --git a/tests/auto/extensionsystem/pluginmanager/test.qbs b/tests/auto/extensionsystem/pluginmanager/test.qbs
index b64f1ef712da730409b4c4f9f63982fe1f2efc7b..cc930a49cfc68099de79911ee879a364b99b59bd 100644
--- a/tests/auto/extensionsystem/pluginmanager/test.qbs
+++ b/tests/auto/extensionsystem/pluginmanager/test.qbs
@@ -1,8 +1,8 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 import "../copytransformer.qbs" as CopyTransformer
 
-Autotest {
+QtcAutotest {
     name: "PluginManager autotest"
     Depends { name: "Aggregation" }
     Depends { name: "ExtensionSystem" }
diff --git a/tests/auto/extensionsystem/pluginspec/test.qbs b/tests/auto/extensionsystem/pluginspec/test.qbs
index 1fa1c8c4208629ed5489d9caed9414dfe8074f18..e87698c333e9804cb49fa7dd65c22c38bfbf730c 100644
--- a/tests/auto/extensionsystem/pluginspec/test.qbs
+++ b/tests/auto/extensionsystem/pluginspec/test.qbs
@@ -1,9 +1,9 @@
 import qbs
 
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 import "../copytransformer.qbs" as CopyTransformer
 
-Autotest {
+QtcAutotest {
     name: "ExtensionSystem pluginspec autotest"
     Depends { name: "Aggregation" }
     Depends { name: "ExtensionSystem" }
diff --git a/tests/auto/externaltool/externaltool.qbs b/tests/auto/externaltool/externaltool.qbs
index 535e1f0b09e681373753236566232bd899995cb7..696d8a0ba7c27298923ab3e2556521625b9aa8bf 100644
--- a/tests/auto/externaltool/externaltool.qbs
+++ b/tests/auto/externaltool/externaltool.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "ExternalTool autotest"
     property path corePluginDir: project.ide_source_tree + "/src/plugins/coreplugin"
     // TODO: This should be all that is needed here: Depends { name: "Core" }
diff --git a/tests/auto/filesearch/filesearch.qbs b/tests/auto/filesearch/filesearch.qbs
index 77c197aa036c79c8937a8ecb4a9c42681c457628..41653c74584473721c3c6010d1717a6436ce6098 100644
--- a/tests/auto/filesearch/filesearch.qbs
+++ b/tests/auto/filesearch/filesearch.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "File search autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // For QTextDocument
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs b/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
index e09b3161b43632b9b349bfa9892a1e82c6a7266f..89d649fb2a0bd862d9f470b369ef349aab377b57 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Highlighter engine autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" }
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.qbs b/tests/auto/generichighlighter/specificrules/specificrules.qbs
index 9cc208b17085479079d884e2a5ee29e0f3ba97ae..ad9c75312b7e6c7089f275734804737d2d8c13b7 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.qbs
+++ b/tests/auto/generichighlighter/specificrules/specificrules.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Generic highlighter specific rules autotest"
     Depends { name: "Qt.widgets" }
     Group {
diff --git a/tests/auto/ioutils/ioutils.qbs b/tests/auto/ioutils/ioutils.qbs
index e339e2cfa6a34b00860b3b8d4555c53147fd6d94..564ff59e087bb231092c62d07b2634e2274d01e0 100644
--- a/tests/auto/ioutils/ioutils.qbs
+++ b/tests/auto/ioutils/ioutils.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "IoUtils autotest"
     Depends { name: "Qt.core" }
     files: [
diff --git a/tests/auto/profilewriter/profilewriter.qbs b/tests/auto/profilewriter/profilewriter.qbs
index 6263fade363f648a9539f4be07535c7b0e126c34..17e40af20e46f028b5f6a1e68e285c6fd8f8e701 100644
--- a/tests/auto/profilewriter/profilewriter.qbs
+++ b/tests/auto/profilewriter/profilewriter.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "ProFileWriter autotest"
     Depends { name: "Qt.xml" }
     Group {
diff --git a/tests/auto/qml/codemodel/check/check.qbs b/tests/auto/qml/codemodel/check/check.qbs
index bd37ce8001904aad0ab0ecd4ab0ee9a36ab856a6..5e1cbf3cd2b9bb1ed15e810db7906bf23df2d3ec 100644
--- a/tests/auto/qml/codemodel/check/check.qbs
+++ b/tests/auto/qml/codemodel/check/check.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QML code model check autotest"
     Depends { name: "LanguageUtils" }
     Depends { name: "QmlJS" }
diff --git a/tests/auto/qml/persistenttrie/persistenttrie.qbs b/tests/auto/qml/persistenttrie/persistenttrie.qbs
index 36181f04ea8e1ecb0b528771d7c047cc1f53cb51..561d699d0668e2cbf7ade9f76680d6a130b9dd39 100644
--- a/tests/auto/qml/persistenttrie/persistenttrie.qbs
+++ b/tests/auto/qml/persistenttrie/persistenttrie.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QML persistenttrie autotest"
     Depends { name: "QmlJS" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
index 76e3f9d5a7e785da3e80932e87c49f7260352ccb..c88b930245411997903ab8951b61c3c13eba680e 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QML code formatter autotest"
     Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
diff --git a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
index c607c03ed35ef2fcb6e01cccab86511c8cc901e3..ccb4ba788662f39a5e10489efbd46e3f9e868ddc 100644
--- a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
+++ b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QMLJS simple reader autotest"
     Depends { name: "QmlJS" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index 134731675a32c3016ecaa41b21db9d1225339ae5..75d487c95a266d01d16e344a12f4eb89b22c402f 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QmlProjectManager file format autotest"
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
diff --git a/tests/auto/qml/qrcparser/qrcparser.qbs b/tests/auto/qml/qrcparser/qrcparser.qbs
index f5d138af111e631b0488191ea13ca18e9db2fdff..977e3bedb1652895abb386e5552b73bcea8629a4 100644
--- a/tests/auto/qml/qrcparser/qrcparser.qbs
+++ b/tests/auto/qml/qrcparser/qrcparser.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QML qrc parser autotest"
     Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
diff --git a/tests/auto/qml/reformatter/reformatter.qbs b/tests/auto/qml/reformatter/reformatter.qbs
index 0fc2c4dd925f35e366f0dd898dc9e234e9dd9804..e1f9655cff48a0a7ba5f4c61c559da29c015b13f 100644
--- a/tests/auto/qml/reformatter/reformatter.qbs
+++ b/tests/auto/qml/reformatter/reformatter.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QML reformatter autotest"
     Depends { name: "QmlJS" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/qtcprocess/qtcprocess.qbs b/tests/auto/qtcprocess/qtcprocess.qbs
index 1050f6c36a07dbff032bbb0ce32b1485629f5688..158bf1e9fa213f8e9beb12220474b1a804c4d619 100644
--- a/tests/auto/qtcprocess/qtcprocess.qbs
+++ b/tests/auto/qtcprocess/qtcprocess.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "QtcProcess autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
diff --git a/tests/auto/treeviewfind/treeviewfind.qbs b/tests/auto/treeviewfind/treeviewfind.qbs
index 915e6671d0969152c132dabadde009047344542a..212a62a5f3b1a972867241467dd07deb1e466bd6 100644
--- a/tests/auto/treeviewfind/treeviewfind.qbs
+++ b/tests/auto/treeviewfind/treeviewfind.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "TreeViewFind autotest"
     Depends { name: "Core" }
     Depends { name: "Qt.widgets" } // For QTextDocument
diff --git a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
index 3192c76e38e1f3cfcd8328a0efca840bc2c07bb4..e5517ece262c927b7fadbe47685244dc859a2ea0 100644
--- a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
+++ b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "ANSI autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/utils/fileutils/fileutils.qbs b/tests/auto/utils/fileutils/fileutils.qbs
index fc2539a24b4abf5544fb5204d265b225da8444fb..8a8b2020870e7a263ba921d80007133e620fd726 100644
--- a/tests/auto/utils/fileutils/fileutils.qbs
+++ b/tests/auto/utils/fileutils/fileutils.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "FileUtils autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/utils_stringutils/utils_stringutils.qbs b/tests/auto/utils_stringutils/utils_stringutils.qbs
index 609dbd08f9a3dec201d31c25d77ef6d8576defe7..00c2af5169eb1b6e1c6aff77fdf5c4a358c492be 100644
--- a/tests/auto/utils_stringutils/utils_stringutils.qbs
+++ b/tests/auto/utils_stringutils/utils_stringutils.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "StringUtils autotest"
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
index 695997e45d41793a3f8ca1db407b5c40efc78173..f4ded88748332d03a290cf8424b26f0be187686c 100644
--- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs
+++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     name: "Memcheck " + testName + " autotest"
     property string testName
     targetName: testName // Test runner hardcodes the names of the executables
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 0b0aee4d775e87a1c0caaf9b2fbb3f897a643ffa..b7745f98f681766e87cabec333cda07acbbb18e3 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
 
-Autotest {
+QtcAutotest {
     Depends { name: "QtcSsh" }
     Depends { name: "Utils" }
     Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed