Remove the base module import from most test data projects

Keep the base import in blackbox/testdata/deprecated-property to ensure
we don't accidentally break it.

Change-Id: I790da21a7490ec9c1b0335f45e8707e7e04daa7c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

316 files changed, 0 insertions, 527 deletions

diff --git a/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs
index 223da0b3c..55495a950 100644
--- a/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs
+++ b/tests/auto/blackbox/testdata/QTBUG-51237/modules/mymodule/mymodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property stringList theProperty: []
     //property stringList otherProperty: theProperty.concat([])
diff --git a/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs b/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs
index 33539a5a1..849a943f8 100644
--- a/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs
+++ b/tests/auto/blackbox/testdata/QTBUG-51237/qtbug-51237.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     type: "custom"
     Depends { name: "mymodule" }
diff --git a/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs b/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs
index 1bc9b15ef..380e98846 100644
--- a/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs
+++ b/tests/auto/blackbox/testdata/add-filetag-to-generated-artifact/add-filetag-to-generated-artifact.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Project {
diff --git a/tests/auto/blackbox/testdata/always-run/rule.qbs b/tests/auto/blackbox/testdata/always-run/rule.qbs
index 6dbb5c845..7d61e5daf 100644
--- a/tests/auto/blackbox/testdata/always-run/rule.qbs
+++ b/tests/auto/blackbox/testdata/always-run/rule.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/always-run/transformer.qbs b/tests/auto/blackbox/testdata/always-run/transformer.qbs
index b5c83eaab..8ae44fb77 100644
--- a/tests/auto/blackbox/testdata/always-run/transformer.qbs
+++ b/tests/auto/blackbox/testdata/always-run/transformer.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/archiver/archivable.qbs b/tests/auto/blackbox/testdata/archiver/archivable.qbs
index d6a8e048d..8e521ddf0 100644
--- a/tests/auto/blackbox/testdata/archiver/archivable.qbs
+++ b/tests/auto/blackbox/testdata/archiver/archivable.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "archivable"
     type: "archiver.archive"
diff --git a/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs b/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs
index 6fa1b5e93..bcd236163 100644
--- a/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs
+++ b/tests/auto/blackbox/testdata/artifact-scanning/artifact-scanning.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "p1"
diff --git a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
index 92579ad7c..2d9c95e95 100644
--- a/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/artifacts-map-change-tracking/artifacts-map-change-tracking.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Project {
diff --git a/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs b/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs
index 9d0c81d26..cd4e9b790 100644
--- a/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs
+++ b/tests/auto/blackbox/testdata/artifacts-map-invalidation/artifacts-map-invalidation.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Project {
diff --git a/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs b/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs
index af568ae45..86255c6c3 100644
--- a/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs
+++ b/tests/auto/blackbox/testdata/artifacts-map-race-condition/artifacts-map-race-condition.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     type: ["custom1", "custom2", "custom3", "custom4", "custom5"]
diff --git a/tests/auto/blackbox/testdata/assembly/assembly.qbs b/tests/auto/blackbox/testdata/assembly/assembly.qbs
index 7dd82731a..f7bd4ecad 100644
--- a/tests/auto/blackbox/testdata/assembly/assembly.qbs
+++ b/tests/auto/blackbox/testdata/assembly/assembly.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs
index 682b4c029..92d5ec6dd 100644
--- a/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs
+++ b/tests/auto/blackbox/testdata/autotest-with-dependencies/autotest-with-dependencies.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/autotests/autotests.qbs b/tests/auto/blackbox/testdata/autotests/autotests.qbs
index b08bc425c..a2c2646dc 100644
--- a/tests/auto/blackbox/testdata/autotests/autotests.qbs
+++ b/tests/auto/blackbox/testdata/autotests/autotests.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: ["test1", "test2", "test3"]
     AutotestRunner {}
diff --git a/tests/auto/blackbox/testdata/autotests/test1/test1.qbs b/tests/auto/blackbox/testdata/autotests/test1/test1.qbs
index 78326994d..8b078a759 100644
--- a/tests/auto/blackbox/testdata/autotests/test1/test1.qbs
+++ b/tests/auto/blackbox/testdata/autotests/test1/test1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "test1"
     type: base.concat("autotest")
diff --git a/tests/auto/blackbox/testdata/autotests/test2/test2.qbs b/tests/auto/blackbox/testdata/autotests/test2/test2.qbs
index 0f110e1e7..2ce6ea5fa 100644
--- a/tests/auto/blackbox/testdata/autotests/test2/test2.qbs
+++ b/tests/auto/blackbox/testdata/autotests/test2/test2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "test2"
     type: base.concat("autotest")
diff --git a/tests/auto/blackbox/testdata/autotests/test3/test3.qbs b/tests/auto/blackbox/testdata/autotests/test3/test3.qbs
index 3c7b734e3..34550dee7 100644
--- a/tests/auto/blackbox/testdata/autotests/test3/test3.qbs
+++ b/tests/auto/blackbox/testdata/autotests/test3/test3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "test3"
     type: base.concat("autotest")
diff --git a/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs b/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs
index 620ae2ea0..6a9e9823d 100644
--- a/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs
+++ b/tests/auto/blackbox/testdata/aux-inputs-from-deps/aux-inputs-from-deps.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs b/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs
index a45391478..bef82a003 100644
--- a/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs
+++ b/tests/auto/blackbox/testdata/badInterpreter/badInterpreter.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     qbsSearchPaths: base.concat(["qbs"])
 
diff --git a/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs b/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs
index 79c008cf6..4d043ee59 100644
--- a/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs
+++ b/tests/auto/blackbox/testdata/badInterpreter/qbs/modules/script-test/script-test.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs b/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs
index 8b5dbb238..4446355bc 100644
--- a/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs
+++ b/tests/auto/blackbox/testdata/bom-sources/bom-sources.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     files: ["main.cpp", "theheader.h"]
diff --git a/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs b/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs
index 7e9d4779b..d71facf15 100644
--- a/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs
+++ b/tests/auto/blackbox/testdata/build-data-of-disabled-product/build-data-of-disabled-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     files: ["main.cpp", "test.cpp"]
diff --git a/tests/auto/blackbox/testdata/build-directories/build-directories.qbs b/tests/auto/blackbox/testdata/build-directories/build-directories.qbs
index 60a4e76dd..be7672ecf 100644
--- a/tests/auto/blackbox/testdata/build-directories/build-directories.qbs
+++ b/tests/auto/blackbox/testdata/build-directories/build-directories.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs b/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs
index f6ae698a0..da7536315 100644
--- a/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs
+++ b/tests/auto/blackbox/testdata/build-graph-versions/build-graph-versions.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["main.cpp"]
 }
diff --git a/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs b/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs
index c2445eafd..6c0bcc73e 100644
--- a/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs
+++ b/tests/auto/blackbox/testdata/buildenv-change/buildenv-change.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Probe {
         id: dummy
diff --git a/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs b/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs
index 8a99d2c8c..2f0dfc08c 100644
--- a/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs
+++ b/tests/auto/blackbox/testdata/change-in-disabled-product/change-in-disabled-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     condition: false
     files: [
diff --git a/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs b/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs
index cb8bf0668..cf5354268 100644
--- a/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs
+++ b/tests/auto/blackbox/testdata/change-in-imported-file/change-in-imported-file.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "prepare.js" as PrepareHelper
 
 Product {
diff --git a/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs b/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs
index 78bd8abda..d1215355c 100644
--- a/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs
+++ b/tests/auto/blackbox/testdata/change-tracking-and-multiplexing/change-tracking-and-multiplexing.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 StaticLibrary {
     name: "l"
 
diff --git a/tests/auto/blackbox/testdata/changed-files/changed-files.qbs b/tests/auto/blackbox/testdata/changed-files/changed-files.qbs
index dd222479f..e5790d2e9 100644
--- a/tests/auto/blackbox/testdata/changed-files/changed-files.qbs
+++ b/tests/auto/blackbox/testdata/changed-files/changed-files.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 CppApplication {
diff --git a/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs b/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs
index 8aef7b9b6..d11613c44 100644
--- a/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs
+++ b/tests/auto/blackbox/testdata/changed-rule-inputs/changed-rule-inputs.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs b/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs
index 32456444c..65c29ca7a 100644
--- a/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs
+++ b/tests/auto/blackbox/testdata/check-timestamps/check-timestamps.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     files: [
diff --git a/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs b/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs
index 233e21746..5f4148624 100644
--- a/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs
+++ b/tests/auto/blackbox/testdata/choose-module-instance/choose-module-instance.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/clean/clean.qbs b/tests/auto/blackbox/testdata/clean/clean.qbs
index 28ebe91f0..ce3a8eb12 100644
--- a/tests/auto/blackbox/testdata/clean/clean.qbs
+++ b/tests/auto/blackbox/testdata/clean/clean.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     DynamicLibrary {
         Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/cli/dotnettest.qbs b/tests/auto/blackbox/testdata/cli/dotnettest.qbs
index c65a54c8c..9a10b8068 100644
--- a/tests/auto/blackbox/testdata/cli/dotnettest.qbs
+++ b/tests/auto/blackbox/testdata/cli/dotnettest.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Application {
         Depends { name: "cli" }
diff --git a/tests/auto/blackbox/testdata/cli/fshello.qbs b/tests/auto/blackbox/testdata/cli/fshello.qbs
index 44dbb5c4f..0d503d90f 100644
--- a/tests/auto/blackbox/testdata/cli/fshello.qbs
+++ b/tests/auto/blackbox/testdata/cli/fshello.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Application {
     Depends { name: "cli" }
     type: "application"
diff --git a/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs b/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs
index c22b41c4f..277fc7c3a 100644
--- a/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs
+++ b/tests/auto/blackbox/testdata/combined-sources/combined-sources.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "theapp"
     files: [
diff --git a/tests/auto/blackbox/testdata/command-file/command-file.qbs b/tests/auto/blackbox/testdata/command-file/command-file.qbs
index fb46a0712..8e25221c5 100644
--- a/tests/auto/blackbox/testdata/command-file/command-file.qbs
+++ b/tests/auto/blackbox/testdata/command-file/command-file.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     StaticLibrary {
         name: "theLib"
diff --git a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs
index da58f750a..b205ef2a7 100644
--- a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs
+++ b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/CppDefinesApp.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["app.c"]
 
diff --git a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs
index b4b126a50..001a87745 100644
--- a/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs
+++ b/tests/auto/blackbox/testdata/compilerDefinesByLanguage/compilerDefinesByLanguage.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppDefinesApp {
         name: "A"
diff --git a/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs b/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs
index 99fec93f2..802aa1450 100644
--- a/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs
+++ b/tests/auto/blackbox/testdata/concurrent-executor/concurrent-executor.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.TextFile
 import "util.js" as Utils
diff --git a/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs b/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs
index c7b6ae09d..0f2fb2f49 100644
--- a/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs
+++ b/tests/auto/blackbox/testdata/conditional-export/conditional-export.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool enableExport: false
     Product {
diff --git a/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs b/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs
index 286eb620a..5f0c93e46 100644
--- a/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs
+++ b/tests/auto/blackbox/testdata/conditional-filetagger/conditional-filetagger.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "theApp"
     property bool enableTagger
diff --git a/tests/auto/blackbox/testdata/configure/configure.qbs b/tests/auto/blackbox/testdata/configure/configure.qbs
index 1a3c02bb5..af5638dde 100644
--- a/tests/auto/blackbox/testdata/configure/configure.qbs
+++ b/tests/auto/blackbox/testdata/configure/configure.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs b/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs
index 56a5492e4..1d647faa2 100644
--- a/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs
+++ b/tests/auto/blackbox/testdata/configure/modules/definition/module.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Process
 
 Module {
diff --git a/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs b/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs
index f2c5cb2bc..ade073e15 100644
--- a/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs
+++ b/tests/auto/blackbox/testdata/conflicting-artifacts/conflicting-artifacts.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "a"
diff --git a/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs b/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs
index 62f163a95..0bfdaceba 100644
--- a/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs
+++ b/tests/auto/blackbox/testdata/cpu-features/cpu-features.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Depends { name: "cpufeatures" }
     cpufeatures.x86_sse2: true
diff --git a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
index e0301eee1..6beaabfa3 100644
--- a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
+++ b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
 
diff --git a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
index ea32bbb52..735bfffbc 100644
--- a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
+++ b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.TextFile
 import qbs.FileInfo
 
diff --git a/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs b/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs
index ef2dee093..8a6f733c0 100644
--- a/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs
+++ b/tests/auto/blackbox/testdata/dependency-profile-mismatch/dependency-profile-mismatch.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property string mainProfile
     property string depProfile
diff --git a/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs b/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs
index 659864b14..f1460aea5 100644
--- a/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs
+++ b/tests/auto/blackbox/testdata/disappeared-profile/disappeared-profile.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     type: ["out1", "out2"]
     Depends { name: "m" }
diff --git a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs
index a9c898889..3e1747ade 100644
--- a/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs
+++ b/tests/auto/blackbox/testdata/disappeared-profile/modules-dir/modules/m/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string p1
     property string p2
diff --git a/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs b/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs
index b7cca4fa8..fdd3aa1f7 100644
--- a/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs
+++ b/tests/auto/blackbox/testdata/discard-unused-data/discard-unused-data.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     type: base.concat("custom")
diff --git a/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs b/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs
index 0802bc562..5de0fe053 100644
--- a/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs
+++ b/tests/auto/blackbox/testdata/driver-linker-flags/driver-linker-flags.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: "main.cpp"
 
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
index 565402a31..b3d901389 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 DynamicLibrary {
     Depends { name: "cpp" }
     Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") }
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs
index 41a6436d0..148902eda 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Module {
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs
index 2a9a7314f..52d19c13c 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Module {
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs
index d422d3f2c..b4592f514 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thethirdlib/thethirdlib.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Module {
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
index 6bd0de9ab..0be9a2fd4 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "theapp"
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs
index 361642cca..b06a3f171 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/thelibs.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Dll {
         name: "thelib"
diff --git a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs
index eb7c56738..166648c80 100644
--- a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.FileInfo
 import qbs.TextFile
diff --git a/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs b/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs
index d5315ac45..b8adcaf4b 100644
--- a/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs
+++ b/tests/auto/blackbox/testdata/dynamicMultiplexRule/dynamicMultiplexRule.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs b/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs
index 04820e18f..5b50b5000 100644
--- a/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs
+++ b/tests/auto/blackbox/testdata/dynamicRuleOutputs/before/genlexer.qbs
@@ -35,7 +35,6 @@
 **
 ****************************************************************************/
 
-import qbs 1.0
 import qbs.FileInfo
 import qbs.Probes
 import qbs.TextFile
diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs
index 74738ad12..eef00da78 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objc.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["main.m"]
     cpp.frameworks: ["Foundation"]
diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs
index b6db6879b..7f703b9ad 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp-cpp.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Group {
         files: ["main.cpp"]
diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs
index 8efb5d585..8946f9a38 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions-objcpp.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Group {
         files: ["main.m"]
diff --git a/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs b/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs
index da6fdbc2d..9a75043a8 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/exceptions.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["main.cpp"]
     cpp.treatWarningsAsErrors: true
diff --git a/tests/auto/blackbox/testdata/enableExceptions/none.qbs b/tests/auto/blackbox/testdata/enableExceptions/none.qbs
index 332af7614..8fb052476 100644
--- a/tests/auto/blackbox/testdata/enableExceptions/none.qbs
+++ b/tests/auto/blackbox/testdata/enableExceptions/none.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["emptymain.cpp"]
 
diff --git a/tests/auto/blackbox/testdata/enableRtti/rtti.qbs b/tests/auto/blackbox/testdata/enableRtti/rtti.qbs
index f032bb16b..85bfa9c1d 100644
--- a/tests/auto/blackbox/testdata/enableRtti/rtti.qbs
+++ b/tests/auto/blackbox/testdata/enableRtti/rtti.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool treatAsObjcpp: false
     CppApplication {
diff --git a/tests/auto/blackbox/testdata/env-merging/env-merging.qbs b/tests/auto/blackbox/testdata/env-merging/env-merging.qbs
index 884dc4745..6edeca444 100644
--- a/tests/auto/blackbox/testdata/env-merging/env-merging.qbs
+++ b/tests/auto/blackbox/testdata/env-merging/env-merging.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "tool"
diff --git a/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs b/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs
index a197208fb..3b242aeb0 100644
--- a/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs
+++ b/tests/auto/blackbox/testdata/env-normalization/env-normalization.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 
 Product {
diff --git a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs
index 8cf1bfaad..6a763e1ad 100644
--- a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs
+++ b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/nonexistentWorkingDir.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Application {
     name: "kaputt"
     type: ["nutritious"]
diff --git a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs
index 7a6c3a25d..047ddb862 100644
--- a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs
+++ b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-filePath/outputArtifacts-missing-filePath.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 CppApplication {
     type: base.concat("txt")
     files : ["main.cpp"]
diff --git a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs
index 9b71cf73a..8b7b9482e 100644
--- a/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs
+++ b/tests/auto/blackbox/testdata/erroneous/outputArtifacts-missing-fileTags/outputArtifacts-missing-fileTags.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 CppApplication {
     type: base.concat("txt")
     files : ["main.cpp"]
diff --git a/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs b/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs
index 3ad31a609..01963292a 100644
--- a/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs
+++ b/tests/auto/blackbox/testdata/erroneous/texttemplate-unknown-placeholder/texttemplate-unknown-placeholder.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     type: ["text"]
     Depends { name: "texttemplate" }
diff --git a/tests/auto/blackbox/testdata/error-info/error-info.qbs b/tests/auto/blackbox/testdata/error-info/error-info.qbs
index afd44c246..b8f42b4b2 100644
--- a/tests/auto/blackbox/testdata/error-info/error-info.qbs
+++ b/tests/auto/blackbox/testdata/error-info/error-info.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "helper.js" as Helper
 
 Project {
diff --git a/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs b/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs
index e136acb30..f48bf8d1f 100644
--- a/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs
+++ b/tests/auto/blackbox/testdata/escaped-linker-flags/escaped-linker-flags.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     property bool escapeLinkerFlags
diff --git a/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs b/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs
index 10cfa089b..4f190c23d 100644
--- a/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs
+++ b/tests/auto/blackbox/testdata/explicitly-depends-on/explicitly-depends-on.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs b/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs
index f1752b4ed..b710c4e21 100644
--- a/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs
+++ b/tests/auto/blackbox/testdata/explicitly-depends-on/modules/module1/module1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Group {
         filesAreTargets: true
diff --git a/tests/auto/blackbox/testdata/export-rule/export-rule.qbs b/tests/auto/blackbox/testdata/export-rule/export-rule.qbs
index 0b1f9f99b..29899e728 100644
--- a/tests/auto/blackbox/testdata/export-rule/export-rule.qbs
+++ b/tests/auto/blackbox/testdata/export-rule/export-rule.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Project {
diff --git a/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs b/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs
index 72c48b75a..42e17486f 100644
--- a/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs
+++ b/tests/auto/blackbox/testdata/export-to-outside-searchpath/export-to-outside-searchpath.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Project {
         qbsSearchPaths: ["qbs-resources"]
diff --git a/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs b/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs
index 3e67ba10d..84957060c 100644
--- a/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs
+++ b/tests/auto/blackbox/testdata/export-to-outside-searchpath/qbs-resources/modules/aModule/aModule.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Module {
 }
diff --git a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs
index 9904502a6..ac6022b9d 100644
--- a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs
+++ b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/exported-dependency-in-disabled-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Application {
         name: "app"
diff --git a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs
index 92f01d5d3..328e5f558 100644
--- a/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs
+++ b/tests/auto/blackbox/testdata/exported-dependency-in-disabled-product/modules/broken/broken.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     validate: { throw "broken!"; }
 }
diff --git a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs
index 2717466b0..ff8beb347 100644
--- a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs
+++ b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/exported-property-in-disabled-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "app"
diff --git a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs
index 92f01d5d3..328e5f558 100644
--- a/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs
+++ b/tests/auto/blackbox/testdata/exported-property-in-disabled-product/modules/broken/broken.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     validate: { throw "broken!"; }
 }
diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs
index 674f78c94..48de6d48a 100644
--- a/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs
+++ b/tests/auto/blackbox/testdata/exports-pkgconfig/exports-pkgconfig.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs
index b753ec295..c898e91d1 100644
--- a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs
+++ b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper1/helper1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     Depends { name: "helper2" }
diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs
index 9d24a812d..2dbdfdb01 100644
--- a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs
+++ b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper2/helper2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.includePaths: "/somedir/include2"
diff --git a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs
index 452191994..57e65f2f9 100644
--- a/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs
+++ b/tests/auto/blackbox/testdata/exports-pkgconfig/modules/helper3/helper3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.includePaths: "/somedir/include3"
diff --git a/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs b/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs
index 252cb8291..02affdfe8 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/consumer.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "consumer"
     qbsSearchPaths: "default/install-root/usr/qbs"
diff --git a/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs b/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs
index 2bad55aaa..27e417ef9 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/exports-qbs.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
index 54f524c23..53a472dbb 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/lib.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 DynamicLibrary {
diff --git a/tests/auto/blackbox/testdata/exports-qbs/tool.qbs b/tests/auto/blackbox/testdata/exports-qbs/tool.qbs
index 01521405f..655597cf7 100644
--- a/tests/auto/blackbox/testdata/exports-qbs/tool.qbs
+++ b/tests/auto/blackbox/testdata/exports-qbs/tool.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 import "helper.js" as Helper
diff --git a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
index d2e983c3e..619f40867 100644
--- a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
+++ b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs b/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs
index e99e0932c..49f413807 100644
--- a/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs
+++ b/tests/auto/blackbox/testdata/fileDependencies/fileDependencies.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         type: "application"
diff --git a/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs b/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs
index 1bd215cc6..890fc51ce 100644
--- a/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs
+++ b/tests/auto/blackbox/testdata/filetagsfilter-merging/MyApplication.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     consoleApplication: true
     Group {
diff --git a/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs b/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs
index ae1342bff..eee20782e 100644
--- a/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs
+++ b/tests/auto/blackbox/testdata/filetagsfilter-merging/filetagsfilter-merging.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 MyApplication {
diff --git a/tests/auto/blackbox/testdata/find/find-cli.qbs b/tests/auto/blackbox/testdata/find/find-cli.qbs
index 63609b3b2..20d94803e 100644
--- a/tests/auto/blackbox/testdata/find/find-cli.qbs
+++ b/tests/auto/blackbox/testdata/find/find-cli.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs b/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs
index f26d92262..f3c10138a 100644
--- a/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs
+++ b/tests/auto/blackbox/testdata/generated-artifact-as-input-to-dynamic-rule/p.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/generator/generator.qbs b/tests/auto/blackbox/testdata/generator/generator.qbs
index 18f2caaea..d0857beb5 100644
--- a/tests/auto/blackbox/testdata/generator/generator.qbs
+++ b/tests/auto/blackbox/testdata/generator/generator.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 CppApplication {
diff --git a/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs b/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs
index d8dccde39..ae1811375 100644
--- a/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs
+++ b/tests/auto/blackbox/testdata/group-condition-change/group-condition-change.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool kaputt: true
     Product {
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs b/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs
index 5fa09c4d0..7347b1211 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/groups-in-modules.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         Depends { name: "dep" }
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
index 3154986a6..cbd30a35d 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Module {
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs
index fbf15f6da..18d11c8f5 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper2/helper2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
 
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs
index 00c619a38..de3e6171c 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper3/helper3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
 
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs
index e2d668209..18dce4dc5 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper4/helper4.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     Depends { name: "helper5" }
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs
index 3e4e8923e..58c8144d6 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper5/helper5.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     Depends {
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs
index 736572570..8f73567e6 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper6/helper6.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
 
diff --git a/tests/auto/blackbox/testdata/ico/ico.qbs b/tests/auto/blackbox/testdata/ico/ico.qbs
index 920189b85..e9d635820 100644
--- a/tests/auto/blackbox/testdata/ico/ico.qbs
+++ b/tests/auto/blackbox/testdata/ico/ico.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         Depends { name: "ico" }
diff --git a/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs b/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs
index 2bff00f35..f5efbd14b 100644
--- a/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs
+++ b/tests/auto/blackbox/testdata/import-assignment/import-assignment.qbs
@@ -1,4 +1,3 @@
-import qbs
 import MyImport
 
 Product {
diff --git a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs
index c229de889..c86a1bbb7 100644
--- a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs
+++ b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking-product.qbs
@@ -1,4 +1,3 @@
-import qbs
 import "irrelevant.js" as Irrelevant
 import "custom1prepare1.js" as Custom1Prepare
 import "custom2prepare" as Custom2Prepare
diff --git a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs
index 009c0897f..c97e0c7f8 100644
--- a/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/import-change-tracking/import-change-tracking.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     qbsSearchPaths: ["."]
     references: "import-change-tracking-product.qbs"
diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs
index 32b8d2a03..d4ed153af 100644
--- a/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs
+++ b/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "amodule" }
 }
diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs
index 92ea2cd45..3402b16de 100644
--- a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs
+++ b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Module {
diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs
index 4c2f9281d..3a4266b78 100644
--- a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs
+++ b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string prop
 }
diff --git a/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs b/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs
index b4d0194a2..3dbb1f641 100644
--- a/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs
+++ b/tests/auto/blackbox/testdata/import-searchpath/import-searchpath.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Project {
         qbsSearchPaths: ["qbs"]
diff --git a/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs b/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs
index 18dc695f3..bdef20fd8 100644
--- a/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs
+++ b/tests/auto/blackbox/testdata/import-searchpath/qbs/imports/CppApplication.qbs
@@ -1,4 +1,2 @@
-import qbs
-
 Product {
 }
diff --git a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs
index c12158d24..a973a2722 100644
--- a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs
+++ b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["somefile.cpp"]
 }
diff --git a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs
index f6ae698a0..da7536315 100644
--- a/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs
+++ b/tests/auto/blackbox/testdata/import-searchpath/src/import-searchpath-app2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["main.cpp"]
 }
diff --git a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
index e81f76077..dfc4cd65e 100644
--- a/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
+++ b/tests/auto/blackbox/testdata/importing-product/importing-product.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Project {
diff --git a/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs b/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs
index 1c6be24bd..4966b2f09 100644
--- a/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs
+++ b/tests/auto/blackbox/testdata/imports-conflict/imports-conflict.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "Utils"
diff --git a/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs b/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs
index 452e4b5bd..182d1e232 100644
--- a/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs
+++ b/tests/auto/blackbox/testdata/includeLookup/includeLookup.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs b/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs
index e894cfd49..c28fd1310 100644
--- a/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs
+++ b/tests/auto/blackbox/testdata/includeLookup/modules/definition/module.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Probes
 
 Module {
diff --git a/tests/auto/blackbox/testdata/innosetup/innosetup.qbs b/tests/auto/blackbox/testdata/innosetup/innosetup.qbs
index 679f1de8f..c9f6a22e8 100644
--- a/tests/auto/blackbox/testdata/innosetup/innosetup.qbs
+++ b/tests/auto/blackbox/testdata/innosetup/innosetup.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs b/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs
index 83aa5cf71..db65e127f 100644
--- a/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs
+++ b/tests/auto/blackbox/testdata/innosetupDependencies/innosetupDependencies.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
index 1b40abaeb..919060c73 100644
--- a/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
+++ b/tests/auto/blackbox/testdata/inputs-from-dependencies/inputs-from-dependencies.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "TextFileContainer1"
diff --git a/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs b/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs
index 3f2c4e974..a3282f941 100644
--- a/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs
+++ b/tests/auto/blackbox/testdata/install-duplicates-no-error/install-duplicates-no-error.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "p1"
diff --git a/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs b/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs
index 2f91ba560..5edc83d81 100644
--- a/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs
+++ b/tests/auto/blackbox/testdata/install-duplicates/install-duplicates.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Group {
         files: ["*.txt"]
diff --git a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs
index 44ddaabd8..0ae3d62e3 100644
--- a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs
+++ b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool dummy: {
         if (qbs.targetOS.contains("windows"))
diff --git a/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs b/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs
index ea7284a05..80a63c956 100644
--- a/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs
+++ b/tests/auto/blackbox/testdata/install-root-from-project-file/install-root-from-project-file.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     property string installRoot
diff --git a/tests/auto/blackbox/testdata/install-tree/install-tree.qbs b/tests/auto/blackbox/testdata/install-tree/install-tree.qbs
index 69571d58a..dde39d231 100644
--- a/tests/auto/blackbox/testdata/install-tree/install-tree.qbs
+++ b/tests/auto/blackbox/testdata/install-tree/install-tree.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["main.cpp"]
     qbs.installPrefix: ""
diff --git a/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs b/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs
index 75ff10c80..2d37e85d6 100644
--- a/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs
+++ b/tests/auto/blackbox/testdata/installable-as-auxiliary-input/installable-as-auxiliary-input.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.FileInfo
 import qbs.TextFile
diff --git a/tests/auto/blackbox/testdata/installable/installable.qbs b/tests/auto/blackbox/testdata/installable/installable.qbs
index eeb0875ad..56feb6ec5 100644
--- a/tests/auto/blackbox/testdata/installable/installable.qbs
+++ b/tests/auto/blackbox/testdata/installable/installable.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs b/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs
index fca3fcca3..7b4d30091 100644
--- a/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs
+++ b/tests/auto/blackbox/testdata/installed-source-files/installed-source-files.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     consoleApplication: true
     files: ["main.cpp"]
diff --git a/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs b/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs
index 244f80abe..aa40b7691 100644
--- a/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs
+++ b/tests/auto/blackbox/testdata/installed-transformer-output/qbs668.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs
index d1f9f54ea..f7ae7f5e0 100644
--- a/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs
+++ b/tests/auto/blackbox/testdata/installed_artifact/installed_artifact.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Application {
     name: "installedApp"
     type: "application"
diff --git a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
index d04ecdd57..190e3f5ef 100644
--- a/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
+++ b/tests/auto/blackbox/testdata/installpackage/installpackage.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "public_tool"
diff --git a/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs b/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs
index 65437311e..28bcca827 100644
--- a/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs
+++ b/tests/auto/blackbox/testdata/invalid-command-property/invalid-command-property.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs b/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs
index ad2f55da4..d5e4dd5c7 100644
--- a/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs
+++ b/tests/auto/blackbox/testdata/invalid-extension-instantiation/invalid-extension-instantiation.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 import qbs.File
 import qbs.FileInfo
diff --git a/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs b/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs
index ffa92dabb..57505712c 100644
--- a/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs
+++ b/tests/auto/blackbox/testdata/invalid-install-dir/invalid-install-dir.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     consoleApplication: true
     files: ["main.cpp"]
diff --git a/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs b/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs
index 1ddfecd38..659b39962 100644
--- a/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs
+++ b/tests/auto/blackbox/testdata/invalid-library-names/invalid-library-names.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     minimumQbsVersion: "1.6"
     property var values: [null, undefined, 5, [], ""]
diff --git a/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs b/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs
index bf6d4a4cf..1e7426744 100644
--- a/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-binaryfile/binaryfile.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.BinaryFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/jsextensions-file/file.qbs b/tests/auto/blackbox/testdata/jsextensions-file/file.qbs
index 93b61d38d..6adf714e2 100644
--- a/tests/auto/blackbox/testdata/jsextensions-file/file.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-file/file.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.FileInfo
 import qbs.TextFile
diff --git a/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs b/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs
index 99d872b19..244f2122e 100644
--- a/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs
index 730468b3a..be9e718df 100644
--- a/tests/auto/blackbox/testdata/jsextensions-process/process.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-process/process.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 import qbs.FileInfo
 import qbs.Process
diff --git a/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs b/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs
index a70b81625..aa1351543 100644
--- a/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-propertylist/propertylist.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Process
 import qbs.PropertyList
 import qbs.TextFile
diff --git a/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs b/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs
index fb54a45ec..c540e9196 100644
--- a/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-temporarydir/jsextensions-temporarydir.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 import qbs.TemporaryDir
 
diff --git a/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs b/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs
index 44c142745..62b54b131 100644
--- a/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs
+++ b/tests/auto/blackbox/testdata/jsextensions-textfile/textfile.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/ld/ld.qbs b/tests/auto/blackbox/testdata/ld/ld.qbs
index f95157012..25fede1b0 100644
--- a/tests/auto/blackbox/testdata/ld/ld.qbs
+++ b/tests/auto/blackbox/testdata/ld/ld.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Library {
         Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs b/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs
index 3708140ad..61f76f4be 100644
--- a/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/lex_outfile/lex_outfile.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     qbsSearchPaths: ".."
     Depends { name: "bisonhelper" }
diff --git a/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs b/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs
index 3708140ad..61f76f4be 100644
--- a/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/lex_prefix/lex_prefix.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     qbsSearchPaths: ".."
     Depends { name: "bisonhelper" }
diff --git a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs
index 3708140ad..61f76f4be 100644
--- a/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/one-grammar/one-grammar.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     qbsSearchPaths: ".."
     Depends { name: "bisonhelper" }
diff --git a/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs b/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs
index fb1375598..7b0c1e515 100644
--- a/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/two-grammars/two-grammars.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Depends { name: "lex_yacc" }
     consoleApplication: true
diff --git a/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs b/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs
index 298190996..7e89b317e 100644
--- a/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs
+++ b/tests/auto/blackbox/testdata/lexyacc/yacc_output/yacc_output.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Depends { name: "lex_yacc" }
     lex_yacc.outputTag: "cpp"
diff --git a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
index 05e3eabed..1be50c0aa 100644
--- a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
+++ b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         consoleApplication: true
diff --git a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs
index 1601baf3c..b30a498bb 100644
--- a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs
+++ b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 DynamicLibrary {
     type: base.concat("custom")
     Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/list-products/list-products.qbs b/tests/auto/blackbox/testdata/list-products/list-products.qbs
index 559a7d274..5431b9371 100644
--- a/tests/auto/blackbox/testdata/list-products/list-products.qbs
+++ b/tests/auto/blackbox/testdata/list-products/list-products.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "a"
diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs
index 3b0b3be49..ba157a7ac 100644
--- a/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs
+++ b/tests/auto/blackbox/testdata/list-properties-with-outer/list-properties-with-outer.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     type: ["outtype"]
     Depends { name: "higher" }
diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs
index a8d1b186f..ddb7b6f40 100644
--- a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs
+++ b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/higher/higher.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "lower" }
     lower.listProp: ["higher"]
diff --git a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs
index 6f9597788..63c97aa76 100644
--- a/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs
+++ b/tests/auto/blackbox/testdata/list-properties-with-outer/modules/lower/lower.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property stringList listProp
 
diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs
index c56dd33bc..67c7c790a 100644
--- a/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs
+++ b/tests/auto/blackbox/testdata/list-property-order/modules/higher1/higher1.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "lower" }
     lower.listProp: ["higher1"]
diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs
index 75600ffa4..3ca22f51c 100644
--- a/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs
+++ b/tests/auto/blackbox/testdata/list-property-order/modules/higher2/higher2.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "lower" }
     lower.listProp: ["higher2"]
diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs
index 5372b92db..f534cf8bf 100644
--- a/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs
+++ b/tests/auto/blackbox/testdata/list-property-order/modules/higher3/higher3.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "lower" }
     lower.listProp: ["higher3"]
diff --git a/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs b/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs
index eeed377bc..c7462676d 100644
--- a/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs
+++ b/tests/auto/blackbox/testdata/list-property-order/modules/lower/lower.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property stringList listProp
 
diff --git a/tests/auto/blackbox/testdata/list-property-order/product.qbs b/tests/auto/blackbox/testdata/list-property-order/product.qbs
index ef5e5c827..e92494693 100644
--- a/tests/auto/blackbox/testdata/list-property-order/product.qbs
+++ b/tests/auto/blackbox/testdata/list-property-order/product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     type: "outtype"
     name: "toplevel"
diff --git a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs
index 15b5906af..ec5b0b358 100644
--- a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs
+++ b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     LoadableModule {
         Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs b/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs
index 2b4d1f241..650f07104 100644
--- a/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs
+++ b/tests/auto/blackbox/testdata/localDeployment/localDeployment.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         type: ["application"]
diff --git a/tests/auto/blackbox/testdata/makefile-generator/app.qbs b/tests/auto/blackbox/testdata/makefile-generator/app.qbs
index c0f423d5c..dfd67276e 100644
--- a/tests/auto/blackbox/testdata/makefile-generator/app.qbs
+++ b/tests/auto/blackbox/testdata/makefile-generator/app.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "the app"
     consoleApplication: true
diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs
index 2ac47b66a..320494d00 100644
--- a/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs
+++ b/tests/auto/blackbox/testdata/maximum-c-language-version/maximum-c-language-version.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     property bool enableNewestModule: true
diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs
index 4dd343b3b..d5b015e42 100644
--- a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs
+++ b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newermodule/newermodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.cLanguageVersion: "c99"
diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs
index f8316a35e..5437957fe 100644
--- a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs
+++ b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/newestmodule/newestmodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.cLanguageVersion: "c11"
diff --git a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs
index a753b3e3e..10e530098 100644
--- a/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs
+++ b/tests/auto/blackbox/testdata/maximum-c-language-version/modules/oldmodule/oldmodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.cLanguageVersion: "c90"
diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs
index 5dd298aa8..71933cf60 100644
--- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs
+++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/maximum-cxx-language-version.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     property bool enableNewestModule: true
diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs
index dfc28b946..88b1da212 100644
--- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs
+++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newermodule/newermodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.cxxLanguageVersion: "c++14"
diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs
index f306a5389..f99932b10 100644
--- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs
+++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/newestmodule/newestmodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.cxxLanguageVersion: "c++17"
diff --git a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs
index b05c855a3..73d3bf16a 100644
--- a/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs
+++ b/tests/auto/blackbox/testdata/maximum-cxx-language-version/modules/oldmodule/oldmodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "cpp" }
     cpp.cxxLanguageVersion: "c++11"
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs
index f536da6ac..1a56e0b7e 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/fakewindows.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 // non-existent versions of Windows should print a QBS warning
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
index 3f214fed2..400bc9397 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 // just to make sure three-digit minimum versions work on macOS
 // this only affects the value of __MAC_OS_X_VERSION_MIN_REQUIRED,
 // not the actual LC_VERSION_MIN_MACOSX command which is limited to two
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
index 0d033b394..b0b7a7a9b 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 // a specific version of the operating systems is specified
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs
index 2285e20ba..a5ea620fd 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified-forced.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 // no minimum versions are specified, and explicitly set to undefined in
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs
index ac0a7abdc..0eeb2d547 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/unspecified.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 // no minimum versions are specified so the profile defaults will be used
diff --git a/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs b/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs
index a30ac2a70..6bb8b96f2 100644
--- a/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs
+++ b/tests/auto/blackbox/testdata/missing-dependency/missing-dependency.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs b/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs
index 6d16a3c53..86718b571 100644
--- a/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs
+++ b/tests/auto/blackbox/testdata/missing-override-prefix/missing-override-prefix.qbs
@@ -1,3 +1 @@
-import qbs
-
 Product { }
diff --git a/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs b/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs
index a294cbd24..421bad1f0 100644
--- a/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs
+++ b/tests/auto/blackbox/testdata/missing-project-file/project-dir/missing-project-file.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: [
         "file.cpp",
diff --git a/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs b/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs
index 6252f98ed..797198686 100644
--- a/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs
+++ b/tests/auto/blackbox/testdata/moved-file-dependency/moved-file-dependency.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     cpp.includePaths: ["subdir1", "subdir2"]
     files: ["main.cpp"]
diff --git a/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs b/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs
index 254e2b4da..51e6b1a5c 100644
--- a/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs
+++ b/tests/auto/blackbox/testdata/multiple-changes/multiple-changes.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool prop: false
     Product {
diff --git a/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs b/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs
index f8371e983..f6fd16ba2 100644
--- a/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs
+++ b/tests/auto/blackbox/testdata/multiple-configurations/multiple-configurations.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     StaticLibrary {
         name: "lib"
diff --git a/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs b/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs
index b36ea5be9..3994bd95f 100644
--- a/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs
+++ b/tests/auto/blackbox/testdata/multiplexed-tool/multiplexed-tool.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "tool"
diff --git a/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs b/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs
index ffca11cdf..73426ddf5 100644
--- a/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs
+++ b/tests/auto/blackbox/testdata/nested-groups/modules/themodule/themodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Group {
         cpp.defines: ["REQUIRED_FOR_FILE3"]
diff --git a/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs b/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs
index 827eda64e..88f5ae30e 100644
--- a/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs
+++ b/tests/auto/blackbox/testdata/nested-groups/nested-groups.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     consoleApplication: true
     Depends { name: "themodule" }
diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs
index a3c117efd..071737c36 100644
--- a/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs
+++ b/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "lowerlevel" }
     lowerlevel.propDependency: "value in higherlevel"
diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs
index 60ddc219b..f8b6a7dc0 100644
--- a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs
+++ b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string propDependency: "value in lowerlevel module"
     property string prop: propDependency
diff --git a/tests/auto/blackbox/testdata/nested-properties/product.qbs b/tests/auto/blackbox/testdata/nested-properties/product.qbs
index 916cee151..e38813b72 100644
--- a/tests/auto/blackbox/testdata/nested-properties/product.qbs
+++ b/tests/auto/blackbox/testdata/nested-properties/product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs b/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs
index fa70aee8d..b297a3f61 100644
--- a/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs
+++ b/tests/auto/blackbox/testdata/new-output-artifact/new-output-artifact.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/no-profile/no-profile.qbs b/tests/auto/blackbox/testdata/no-profile/no-profile.qbs
index cc251c6ab..6fd7dd07a 100644
--- a/tests/auto/blackbox/testdata/no-profile/no-profile.qbs
+++ b/tests/auto/blackbox/testdata/no-profile/no-profile.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     property bool dummy: { console.info("profile: " + project.profile); }
 }
diff --git a/tests/auto/blackbox/testdata/nodejs/hello.qbs b/tests/auto/blackbox/testdata/nodejs/hello.qbs
index d5e92209a..c19e455db 100644
--- a/tests/auto/blackbox/testdata/nodejs/hello.qbs
+++ b/tests/auto/blackbox/testdata/nodejs/hello.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 NodeJSApplication {
     nodejs.applicationFile: "hello.js"
     name: "hello"
diff --git a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs
index 1ec764dfa..abd41fb6b 100644
--- a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs
+++ b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/non-broken-files-in-broken-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     consoleApplication: true
     files: ["fine.cpp", "broken.cpp"]
diff --git a/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs b/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs
index 498344975..6e006e831 100644
--- a/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs
+++ b/tests/auto/blackbox/testdata/non-default-product/non-default-product.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "default app"
diff --git a/tests/auto/blackbox/testdata/nsis/hello.qbs b/tests/auto/blackbox/testdata/nsis/hello.qbs
index b7f3da505..a161a6998 100644
--- a/tests/auto/blackbox/testdata/nsis/hello.qbs
+++ b/tests/auto/blackbox/testdata/nsis/hello.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 NSISSetup {
     condition: qbs.targetOS.contains("windows")
     name: "Qbs Hello"
diff --git a/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs b/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs
index 1d1e5c067..d8185aabf 100644
--- a/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs
+++ b/tests/auto/blackbox/testdata/nsisDependencies/nsisDependencies.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs b/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs
index 1ef57bae7..d52246578 100644
--- a/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs
+++ b/tests/auto/blackbox/testdata/out-of-date-marking/out-of-date-marking.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 CppApplication {
diff --git a/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs b/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs
index a9090f3db..7ec8fd916 100644
--- a/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs
+++ b/tests/auto/blackbox/testdata/output-artifact-auto-tagging/output-artifact-auto-tagging.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 CppApplication {
diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs
index b26b0f31f..b69dd0da8 100644
--- a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs
+++ b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 DynamicLibrary {
     name: "helperLib"
     files: "helperlib.cpp"
diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs
index 6e8ef62a1..650606fbd 100644
--- a/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs
+++ b/tests/auto/blackbox/testdata/overrideProjectProperties/overrideProjectProperties.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     property string nameSuffix: ""
     property bool someBool
diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs
index c61716e6e..1eb21cdd1 100644
--- a/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs
+++ b/tests/auto/blackbox/testdata/overrideProjectProperties/project_using_helper_lib.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     property bool linkSuccessfully: false
     references: linkSuccessfully ? ["helper_lib.qbs"] : []
diff --git a/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs b/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs
index 2cfb17337..3da526fdb 100644
--- a/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/pch-change-tracking/pch-change-tracking.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: [
         "header1.h",
diff --git a/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs b/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs
index 514de7ecb..a81b8f6c9 100644
--- a/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs
+++ b/tests/auto/blackbox/testdata/per-group-define-in-export-item/per-group-define-in-export-item.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "dep"
diff --git a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs
index ecbfd6c9d..991876f6b 100644
--- a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs
+++ b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/modules/themodule/themodule.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Probes
 
 Module {
diff --git a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs
index 0eac3cca0..11498ebdb 100644
--- a/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs
+++ b/tests/auto/blackbox/testdata/pkg-config-probe-sysroot/pkg-config.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property string packageBaseName
 
diff --git a/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs b/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs
index 8edd218c3..d5488da1f 100644
--- a/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs
+++ b/tests/auto/blackbox/testdata/pkg-config-probe/modules/themodule/themodule.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Probes
 
 Module {
diff --git a/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs b/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs
index db831fbc2..d4dc3b92b 100644
--- a/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs
+++ b/tests/auto/blackbox/testdata/pkg-config-probe/pkg-config.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property string packageBaseName
 
diff --git a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
index 3ae2f3c9a..e89371528 100644
--- a/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
+++ b/tests/auto/blackbox/testdata/plugin-dependency/plugin-dependency.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "myapp"
diff --git a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs
index b30f76874..bbd524e23 100644
--- a/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs
+++ b/tests/auto/blackbox/testdata/precompiled-and-prefix-headers/precompiled-and-prefix-headers.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "MyApp"
     consoleApplication: true
diff --git a/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs b/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs
index 619e44f20..bd1d3162a 100644
--- a/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs
+++ b/tests/auto/blackbox/testdata/prevent-floating-point-values/prevent-floating-point-values.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     property bool dummy: { console.info("version: " + version); }
diff --git a/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs b/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs
index ff37985a4..6007a33ac 100644
--- a/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/probe-change-tracking/probe-change-tracking.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Probe {
         id: tlpProbe
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs
index 121ec6c39..fe81cf55c 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/dependee.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "dependee"
     Depends { name: "myothermodule" }
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs
index 1413777dc..eea5180ef 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/dependency.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "dependency"
     Export {
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs
index a9a27edb4..41c6cfe50 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/depmodule/depmodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string prop
     property stringList listProp: []
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs
index 622dcf0ec..89d544f7e 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/mymodule/mymodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "depmodule" }
     Probe {
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs
index d3009f532..4ea5dd077 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/modules/myothermodule/myothermodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "depmodule" }
     depmodule.listProp: ["myother"]
diff --git a/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs b/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs
index 4e0f13f60..398090195 100644
--- a/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs
+++ b/tests/auto/blackbox/testdata/probe-in-exported-module/probe-in-exported-module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: [ "dependee.qbs", "dependency.qbs" ]
 }
diff --git a/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs b/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs
index 36842e40b..673e478b8 100644
--- a/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs
+++ b/tests/auto/blackbox/testdata/probeProperties/probeProperties.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Probes
 
 CppApplication {
diff --git a/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs b/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs
index b76cffa00..e5c368a88 100644
--- a/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs
+++ b/tests/auto/blackbox/testdata/probes-and-array-properties/modules/mymodule/mymodule.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Probe {
         id: propProbe
diff --git a/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs b/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs
index c7d88ec14..70ca8e1de 100644
--- a/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs
+++ b/tests/auto/blackbox/testdata/probes-and-array-properties/probes-and-array-properties.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "theProduct"
     type: ["the-output"]
diff --git a/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs b/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs
index 660c088a0..19fc67f71 100644
--- a/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs
+++ b/tests/auto/blackbox/testdata/probes-and-shadow-products/probes-and-shadow-products.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "p"
     multiplexByQbsProperties: "buildVariants"
diff --git a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs
index b6d39b021..5a254b49b 100644
--- a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs
+++ b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/inner/inner.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Probes
 
 Module {
diff --git a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs
index 71b745f44..4472d573b 100644
--- a/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs
+++ b/tests/auto/blackbox/testdata/probes-in-nested-modules/modules/outer/outer.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "inner" }
 
diff --git a/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs b/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs
index ffc273e18..877300c1a 100644
--- a/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs
+++ b/tests/auto/blackbox/testdata/probes-in-nested-modules/probes-in-nested-modules.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "a"
diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs
index f3d789842..5bc1fd613 100644
--- a/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/modules/myconfig/myconfig.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property bool typeDecider: true
 }
diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
index 1297a3942..8fa761a2d 100644
--- a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
+++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/productproperties/app.qbs b/tests/auto/blackbox/testdata/productproperties/app.qbs
index 405d08adb..b867aec3d 100644
--- a/tests/auto/blackbox/testdata/productproperties/app.qbs
+++ b/tests/auto/blackbox/testdata/productproperties/app.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     consoleApplication: true
     type: "application"
diff --git a/tests/auto/blackbox/testdata/productproperties/header.qbs b/tests/auto/blackbox/testdata/productproperties/header.qbs
index 5c3e2db63..42f9c88d9 100644
--- a/tests/auto/blackbox/testdata/productproperties/header.qbs
+++ b/tests/auto/blackbox/testdata/productproperties/header.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/productproperties/productproperties.qbs b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
index 75c6224bc..79fdc34a2 100644
--- a/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
+++ b/tests/auto/blackbox/testdata/productproperties/productproperties.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     property string blubbProp: "5"
     references: ["header.qbs", "app.qbs"]
diff --git a/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs b/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs
index 5fc79d432..253992dd0 100644
--- a/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs
+++ b/tests/auto/blackbox/testdata/project_filepath_check/project1.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 CppApplication {
     files: "main.cpp"
 }
diff --git a/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs b/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs
index 9abdac987..8bae2dd60 100644
--- a/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs
+++ b/tests/auto/blackbox/testdata/project_filepath_check/project2.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 CppApplication {
     files: "main2.cpp"
 }
diff --git a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs
index db9f3b2b4..a13578f95 100644
--- a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs
+++ b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     minimumQbsVersion: "1.6"
 
diff --git a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs
index 38b15d807..8170c1991 100644
--- a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs
+++ b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/modules/m/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property bool doFail
     Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs
index 8a3a6f359..baf315bfc 100644
--- a/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs
+++ b/tests/auto/blackbox/testdata/property-assignment-in-failed-module/property-assignment-in-failed-module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "app"
     Depends { name: "m"; required: false }
diff --git a/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs b/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs
index 4484a2542..a01d6c561 100644
--- a/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs
+++ b/tests/auto/blackbox/testdata/property-assignment-on-non-present-module/property-assignment-on-non-present-module.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "nein"; required: false }
     nein.doch: "ohhh!"
diff --git a/tests/auto/blackbox/testdata/property-precedence/dep.qbs b/tests/auto/blackbox/testdata/property-precedence/dep.qbs
index c464b7d24..9f9668ceb 100644
--- a/tests/auto/blackbox/testdata/property-precedence/dep.qbs
+++ b/tests/auto/blackbox/testdata/property-precedence/dep.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "dep"
     Export {
diff --git a/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs b/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs
index 741174eb2..1bfb1a1b8 100644
--- a/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs
+++ b/tests/auto/blackbox/testdata/property-precedence/modules/leaf/leaf.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property string scalarProp: "leaf"
     property stringList listProp: ["leaf"]
diff --git a/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs b/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs
index d67b261c1..a829da09d 100644
--- a/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs
+++ b/tests/auto/blackbox/testdata/property-precedence/modules/nonleaf/nonleaf.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "leaf" }
 
diff --git a/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs b/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs
index 5246c8a7b..1691376e8 100644
--- a/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs
+++ b/tests/auto/blackbox/testdata/property-precedence/property-precedence.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     references: ["dep.qbs"]
     Product {
diff --git a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
index 14cdc570e..b1e4a1fdc 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Module {
diff --git a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
index da9a862c5..f13b1986e 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.Environment
 import qbs.File
 import qbs.TextFile
diff --git a/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs b/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs
index 21d6f75ef..1d8ea961c 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/ruletest.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "ruletest"
     type: "test-output"
diff --git a/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs b/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs
index 0639adc8a..88c565ba2 100644
--- a/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs
+++ b/tests/auto/blackbox/testdata/pseudo-multiplexing/pseudo-multiplexing.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "a"
diff --git a/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs b/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs
index d7ef0d68b..ced0f3a33 100644
--- a/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs
+++ b/tests/auto/blackbox/testdata/qbsVersion/qbs-version.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property string qbsVersion
     property int qbsVersionMajor
diff --git a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs
index 42ec452db..ca71ab930 100644
--- a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs
+++ b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs b/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs
index 0ed6fa72f..b49e9c53f 100644
--- a/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs
+++ b/tests/auto/blackbox/testdata/recursive_renaming/recursive_renaming.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     qbs.installPrefix: ""
     Group {
diff --git a/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs b/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs
index dc993ae23..4e9da01d3 100644
--- a/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs
+++ b/tests/auto/blackbox/testdata/recursive_wildcards/recursive_wildcards.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs b/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs
index 91069f629..d64244f0f 100644
--- a/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs
+++ b/tests/auto/blackbox/testdata/referenceErrorInExport/referenceErrorInExport.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         Depends { name: "other" }
diff --git a/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs b/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs
index e6f3cf66b..d42a760dd 100644
--- a/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs
+++ b/tests/auto/blackbox/testdata/renameDependency/before/renameDependency.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["*.cpp", "*.h"]
 }
diff --git a/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs b/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs
index ebf2ba639..f7ed8e61a 100644
--- a/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs
+++ b/tests/auto/blackbox/testdata/reproducible-build/reproducible-build.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     name: "the product"
     files: ["file1.cpp", "file2.cpp", "main.cpp"]
diff --git a/tests/auto/blackbox/testdata/require-deprecated/require.qbs b/tests/auto/blackbox/testdata/require-deprecated/require.qbs
index d30a15805..87d8b054b 100644
--- a/tests/auto/blackbox/testdata/require-deprecated/require.qbs
+++ b/tests/auto/blackbox/testdata/require-deprecated/require.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import 'blubb.js' as blubb
 
 Product {
diff --git a/tests/auto/blackbox/testdata/require/require.qbs b/tests/auto/blackbox/testdata/require/require.qbs
index d30a15805..87d8b054b 100644
--- a/tests/auto/blackbox/testdata/require/require.qbs
+++ b/tests/auto/blackbox/testdata/require/require.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import 'blubb.js' as blubb
 
 Product {
diff --git a/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs b/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs
index 03fdf7a6b..640d2c3b3 100644
--- a/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs
+++ b/tests/auto/blackbox/testdata/rescue-transformer-data/modules/m/m.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     property bool p
 
diff --git a/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs b/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs
index 2eafcc01d..4d266bbd4 100644
--- a/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs
+++ b/tests/auto/blackbox/testdata/rescue-transformer-data/transformer-data-rescue.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     type: base.concat(["out"])
     Depends { name: "m" }
diff --git a/tests/auto/blackbox/testdata/response-files/response-files.qbs b/tests/auto/blackbox/testdata/response-files/response-files.qbs
index 1e1e75314..fbb6f0518 100644
--- a/tests/auto/blackbox/testdata/response-files/response-files.qbs
+++ b/tests/auto/blackbox/testdata/response-files/response-files.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs b/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs
index 6e2bf4430..9c0f01217 100644
--- a/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs
+++ b/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs b/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs
index 6719bc69d..1bd9beebf 100644
--- a/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs
+++ b/tests/auto/blackbox/testdata/rule-with-non-required-inputs/rule-with-non-required-inputs.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs b/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs
index 187367388..0044537cb 100644
--- a/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs
+++ b/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs b/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs
index 766bf3c5d..a8f7ffad2 100644
--- a/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs
+++ b/tests/auto/blackbox/testdata/ruleConditions/ruleConditions.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import "templates/zorduct.qbs" as Zorduct
 
 Project {
diff --git a/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs b/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs
index 8f19a5a6d..cddad8c30 100644
--- a/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs
+++ b/tests/auto/blackbox/testdata/ruleConditions/templates/zorduct.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     type: ["application", "zort"]
     consoleApplication: true
diff --git a/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs b/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs
index 6898afeac..1c5d61d95 100644
--- a/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs
+++ b/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: "the cycle of life"
diff --git a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
index b28d7b822..48bdff904 100644
--- a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
+++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication {
         name: "app1"
diff --git a/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs b/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs
index 9beb22393..9213c6469 100644
--- a/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs
+++ b/tests/auto/blackbox/testdata/setup-build-environment/modules/buildenv/buildenv.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 
 Module {
diff --git a/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs b/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs
index 81cf47bcd..74e718c50 100644
--- a/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs
+++ b/tests/auto/blackbox/testdata/setup-build-environment/modules/m/m.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs b/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs
index 3248815f0..c5a7e87e0 100644
--- a/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs
+++ b/tests/auto/blackbox/testdata/setup-build-environment/setup-build-environment.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     Product {
         name: "first_product"
diff --git a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs
index 8a5312d75..b5ac8b289 100644
--- a/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs
+++ b/tests/auto/blackbox/testdata/setup-run-environment/setup-run-environment.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs
index 44d8013b9..aac0692a8 100644
--- a/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs
+++ b/tests/auto/blackbox/testdata/smart-relinking/smart-relinking.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     minimumQbsVersion: "1.6"
     Probe {
diff --git a/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs b/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs
index ef038a687..3486667f9 100644
--- a/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs
+++ b/tests/auto/blackbox/testdata/source-artifact-in-inputs-from-dependencies/source-artifact-in-inputs-from-dependencies.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/soversion/soversion.qbs b/tests/auto/blackbox/testdata/soversion/soversion.qbs
index d024c25b9..6ce2144c0 100644
--- a/tests/auto/blackbox/testdata/soversion/soversion.qbs
+++ b/tests/auto/blackbox/testdata/soversion/soversion.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 DynamicLibrary {
     name: "mylib"
     property bool useVersion
diff --git a/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs b/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs
index 6109b428c..32a58c94b 100644
--- a/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs
+++ b/tests/auto/blackbox/testdata/static-lib-without-sources/static-lib-without-sources.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
 StaticLibrary {
     name: "a"
diff --git a/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs b/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs
index b3fba23fe..8abd12869 100644
--- a/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs
+++ b/tests/auto/blackbox/testdata/subprofile-change-tracking/subprofile-change-tracking.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     CppApplication { name: "app1"; files: ["main1.cpp"] }
     CppApplication {
diff --git a/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs b/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs
index f42ca4096..77df81e39 100644
--- a/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs
+++ b/tests/auto/blackbox/testdata/successive-changes/successive-changes.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs
index f913a8efb..3d43ef1f5 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-command.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs
index 93bfca81d..b074c00cf 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-eval.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs
index b3d402062..0408c9d5a 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-prepare.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs b/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs
index dd97839c2..f47b204d5 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/copy-probe.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs
index bb96aa1dc..c20d6f2ef 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-command.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs
index 4cd0d634e..2a759d93a 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-eval.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs
index bc439125e..7b39a8969 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-prepare.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs b/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs
index d2c8b8ded..fff82df81 100644
--- a/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs
+++ b/tests/auto/blackbox/testdata/suspicious-calls/direntries-probe.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
index 127d459c8..b2df70033 100644
--- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
+++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs b/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs
index a2f450082..4aa36142d 100644
--- a/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs
+++ b/tests/auto/blackbox/testdata/symlink-removal/symlink-removal.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.File
 
 Product {
diff --git a/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs b/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs
index 081d40202..9c644fc2a 100644
--- a/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs
+++ b/tests/auto/blackbox/testdata/system-include-paths/system-include-paths.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     files: ["main.cpp"]
     cpp.systemIncludePaths: ["subdir"]
diff --git a/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs b/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs
index 7f9fa3000..6e2137173 100644
--- a/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs
+++ b/tests/auto/blackbox/testdata/system-run-paths/system-run-paths.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     property bool setRunPaths
     Product {
diff --git a/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs b/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs
index 8b312e7c6..6abda64f9 100644
--- a/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs
+++ b/tests/auto/blackbox/testdata/texttemplate/texttemplatetest.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     name: "one"
     type: ["text"]
diff --git a/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs b/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs
index 6d16a3c53..86718b571 100644
--- a/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs
+++ b/tests/auto/blackbox/testdata/toplevel-searchpath/qbs-resources/imports/MyProduct.qbs
@@ -1,3 +1 @@
-import qbs
-
 Product { }
diff --git a/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs b/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs
index 2dd54a81f..8ca6cfca9 100644
--- a/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs
+++ b/tests/auto/blackbox/testdata/toplevel-searchpath/toplevel-searchpath.qbs
@@ -1,3 +1 @@
-import qbs
-
 MyProduct { }
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs
index 469aff097..f4b9ba21f 100644
--- a/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/trackAddFile.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: 'someapp'
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs
index fc647cdbe..bb0ab7d44 100644
--- a/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/trackAddFile.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project {
     Product {
         name: 'someapp'
diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
index 232c8ea41..534f49ff2 100644
--- a/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
+++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/trackExternalProductChanges.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Environment
 import "fileList.js" as FileList
 
diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs
index c0e5c4715..869ce238b 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/after/trackFileTags.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs
index 7ac895c5f..ebe31bf26 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/before/trackFileTags.qbs
@@ -1,4 +1,3 @@
-import qbs 1.0
 import qbs.TextFile
 
 Project {
diff --git a/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs b/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs
index 4dac755c0..bd9cdc009 100644
--- a/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs
+++ b/tests/auto/blackbox/testdata/trackProducts/after/product3.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     Depends { name: "cpp" }
     type: "application"
diff --git a/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs b/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs
index 343405c08..2935ed1df 100644
--- a/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs
+++ b/tests/auto/blackbox/testdata/trackProducts/after/trackProducts.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project
 {
     name: "trackProducts"
diff --git a/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs b/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs
index 60e8b0924..48176c809 100644
--- a/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs
+++ b/tests/auto/blackbox/testdata/trackProducts/before/product1.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     Depends { name: "cpp" }
     type: "application"
diff --git a/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs b/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs
index 5490b8844..be250486d 100644
--- a/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs
+++ b/tests/auto/blackbox/testdata/trackProducts/before/product2.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     Depends { name: "cpp" }
     type: "application"
diff --git a/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs b/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs
index 6d5555c68..8b5edb6bf 100644
--- a/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs
+++ b/tests/auto/blackbox/testdata/trackProducts/before/trackProducts.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Project
 {
     name: "trackProducts"
diff --git a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs
index adec14e41..ffe7ef70a 100644
--- a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs
+++ b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/a/a.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends { name: "b"; required: false }
 }
diff --git a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs
index fb38b600a..ba08b862b 100644
--- a/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs
+++ b/tests/auto/blackbox/testdata/transitive-optional-dependencies/modules/b/b.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     condition: false
 }
diff --git a/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs b/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs
index 08860b057..6171fa94f 100644
--- a/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs
+++ b/tests/auto/blackbox/testdata/transitive-optional-dependencies/transitive-optional-dependencies.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     Depends { name: "a" }
 }
diff --git a/tests/auto/blackbox/testdata/typescript/typescript.qbs b/tests/auto/blackbox/testdata/typescript/typescript.qbs
index b6604830f..28c62eb45 100644
--- a/tests/auto/blackbox/testdata/typescript/typescript.qbs
+++ b/tests/auto/blackbox/testdata/typescript/typescript.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Project {
     NodeJSApplication {
         Depends { name: "typescript" }
diff --git a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs
index 7d4087620..cd2d23895 100644
--- a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs
+++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/usings-as-sole-inputs-non-multiplexed.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 import qbs.TextFile
 
diff --git a/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs b/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs
index a1dff378e..b6e025e4c 100644
--- a/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs
+++ b/tests/auto/blackbox/testdata/variant-suffix/variant-suffix.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 StaticLibrary {
     name: "l"
 
diff --git a/tests/auto/blackbox/testdata/vcs/vcstest.qbs b/tests/auto/blackbox/testdata/vcs/vcstest.qbs
index 11d001743..5d359e2c7 100644
--- a/tests/auto/blackbox/testdata/vcs/vcstest.qbs
+++ b/tests/auto/blackbox/testdata/vcs/vcstest.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 CppApplication {
     Depends { name: "vcs" }
     vcs.headerFileName: "my-repo-state.h"
diff --git a/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs b/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs
index 4a9c85ceb..c5ab20f58 100644
--- a/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs
+++ b/tests/auto/blackbox/testdata/versioncheck/modules/higher/higher.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Module {
     Depends {
         name: "lower"
diff --git a/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs b/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs
index 9322b53b1..cd8c6471d 100644
--- a/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs
+++ b/tests/auto/blackbox/testdata/versioncheck/modules/lower/lower.qbs
@@ -1,3 +1 @@
-import qbs
-
 Module { }
diff --git a/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs b/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs
index 8214428f1..63bef1d75 100644
--- a/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs
+++ b/tests/auto/blackbox/testdata/versioncheck/versioncheck.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 Product {
     property string requestedMinVersion
     property string requestedMaxVersion
diff --git a/tests/auto/blackbox/testdata/versionscript/versionscript.qbs b/tests/auto/blackbox/testdata/versionscript/versionscript.qbs
index 5af798f5f..cc5c7b1cc 100644
--- a/tests/auto/blackbox/testdata/versionscript/versionscript.qbs
+++ b/tests/auto/blackbox/testdata/versionscript/versionscript.qbs
@@ -1,5 +1,3 @@
-import qbs
-
 DynamicLibrary {
     type: base.concat("custom")
     Depends { name: "cpp" }
diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
index 4ab93af28..f3bcff2cd 100644
--- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
+++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.Utilities
 
 Project {
diff --git a/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs b/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs
index 68043f991..124161880 100644
--- a/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs
+++ b/tests/auto/blackbox/testdata/wildcard_renaming/wildcard_renaming.qbs
@@ -1,5 +1,3 @@
-import qbs 1.0
-
 Product {
     qbs.installPrefix: ""
     Group {
diff --git a/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
index 88fadd3a5..f6662529d 100644
--- a/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
+++ b/tests/auto/blackbox/testdata/wildcards-and-rules/wildcards-and-rules.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Product {
diff --git a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs
index eabb6da1e..07f61ba2c 100644
--- a/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs
+++ b/tests/auto/blackbox/testdata/wix/WiXInstallers.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.FileInfo
 
 Project {
diff --git a/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs b/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs
index 92724e25c..d42a18054 100644
--- a/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs
+++ b/tests/auto/blackbox/testdata/wixDependencies/wixDependencies.qbs
@@ -1,4 +1,3 @@
-import qbs
 import qbs.TextFile
 
 Project {