diff --git a/tests/auto/changeset/changeset.qbs b/tests/auto/changeset/changeset.qbs
index 897ce8ac9cc2bb252de3b4880bc514a9f5aec227..f4649183583ac111f394e751b9eb53ee311982db 100644
--- a/tests/auto/changeset/changeset.qbs
+++ b/tests/auto/changeset/changeset.qbs
@@ -3,6 +3,5 @@ import qbs
 QtcAutotest {
     name: "ChangeSet autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.gui" } // TODO: Remove once qbs bug is fixed.
     files: "tst_changeset.cpp"
 }
diff --git a/tests/auto/environment/environment.qbs b/tests/auto/environment/environment.qbs
index 2383e0e856900dc3afbb3143b63408031ead6ecd..476342fbd9546a61d9c6f8e6e0b096dd29ec3902 100644
--- a/tests/auto/environment/environment.qbs
+++ b/tests/auto/environment/environment.qbs
@@ -3,6 +3,5 @@ import qbs
 QtcAutotest {
     name: "Environment autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
     files: "tst_environment.cpp"
 }
diff --git a/tests/auto/externaltool/externaltool.qbs b/tests/auto/externaltool/externaltool.qbs
index 8a2c7afcc8715b1806081f07dcf0fa4a083be528..932ad725fb7545eee0d386329b6091532f739096 100644
--- a/tests/auto/externaltool/externaltool.qbs
+++ b/tests/auto/externaltool/externaltool.qbs
@@ -4,7 +4,6 @@ QtcAutotest {
     name: "ExternalTool autotest"
     Depends { name: "Core" }
     Depends { name: "app_version_header" }
-    Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
 
     Group {
         name: "Duplicated sources from Core plugin" // Ewww. But the .pro file does the same.
diff --git a/tests/auto/qml/persistenttrie/persistenttrie.qbs b/tests/auto/qml/persistenttrie/persistenttrie.qbs
index 457f457bebbcaa33fd1127818214ff80b6e0d9ea..0e07e49423a4327037f50b6d13b9dfc64fe5efab 100644
--- a/tests/auto/qml/persistenttrie/persistenttrie.qbs
+++ b/tests/auto/qml/persistenttrie/persistenttrie.qbs
@@ -3,7 +3,6 @@ import qbs
 QtcAutotest {
     name: "QML persistenttrie autotest"
     Depends { name: "QmlJS" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     files: [ "tst_testtrie.h", "tst_testtrie.cpp" ]
     cpp.defines: base.concat([
         'QMLJS_BUILD_DIR',
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
index c3babbc9c1b65203e8b81f7e855aa94aa86e6a4b..3cccb75c16657c825f7ac5a9b43ab59859b518f6 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
@@ -4,6 +4,6 @@ QtcAutotest {
     name: "QML code formatter autotest"
     Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
-    Depends { name: "Qt.widgets" }  // TODO: Remove when qbs bug is fixed
+    Depends { name: "Qt.widgets" }
     files: "tst_qmlcodeformatter.cpp"
 }
diff --git a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
index df386b86fd57d2f899ae78022851c95623052738..57d7ee5e54ea95dce0d9cd6f0716e0200b711472 100644
--- a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
+++ b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
@@ -3,7 +3,6 @@ import qbs
 QtcAutotest {
     name: "QMLJS simple reader autotest"
     Depends { name: "QmlJS" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     files: "tst_qmljssimplereader.cpp"
     cpp.defines: base.concat(["QT_CREATOR"])
 }
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index f6163c4e6764df7c07e54c9dc5368abc6e58c2cb..bd269c499a063c2ad0cc40efe2d73c65a3875da4 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -5,7 +5,6 @@ QtcAutotest {
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
     Depends { name: "Qt"; submodules: ["script"]; }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"
     files: "tst_fileformat.cpp"
     Group {
diff --git a/tests/auto/qml/reformatter/reformatter.qbs b/tests/auto/qml/reformatter/reformatter.qbs
index 02e938e528f377cc4df40a2088fa56b70ba82f74..7c009748ee15debdbd94bad8c106d5d2050230ee 100644
--- a/tests/auto/qml/reformatter/reformatter.qbs
+++ b/tests/auto/qml/reformatter/reformatter.qbs
@@ -3,7 +3,7 @@ import qbs
 QtcAutotest {
     name: "QML reformatter autotest"
     Depends { name: "QmlJS" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
+    Depends { name: "Qt.widgets" }
     files: "tst_reformatter.cpp"
     cpp.defines: base.concat([
         'QT_CREATOR',
diff --git a/tests/auto/qtcprocess/qtcprocess.qbs b/tests/auto/qtcprocess/qtcprocess.qbs
index 75888cdf6ca20dbd59a74f58dace6b7cb2cf986c..53f5dcfd2fef5019cba61a5022a7c642529b3681 100644
--- a/tests/auto/qtcprocess/qtcprocess.qbs
+++ b/tests/auto/qtcprocess/qtcprocess.qbs
@@ -3,7 +3,6 @@ import qbs
 QtcAutotest {
     name: "QtcProcess autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
     files: "tst_qtcprocess.cpp"
     Properties {
         condition: qbs.targetOS === "windows"
diff --git a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
index 0abfdeb88f6a143bb200def3bf3a03f26d059de9..8a6e9f6bf039fd3be360bc5babf2da3f7274c189 100644
--- a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
+++ b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
@@ -3,6 +3,5 @@ import qbs
 QtcAutotest {
     name: "ANSI autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     files: "tst_ansiescapecodehandler.cpp"
 }
diff --git a/tests/auto/utils/fileutils/fileutils.qbs b/tests/auto/utils/fileutils/fileutils.qbs
index 3b9726c3fc90ffdf3298d4334c79312b23a0d662..e19452481edf58d5b621355260d12a0ee4919d4a 100644
--- a/tests/auto/utils/fileutils/fileutils.qbs
+++ b/tests/auto/utils/fileutils/fileutils.qbs
@@ -3,7 +3,6 @@ import qbs
 QtcAutotest {
     name: "FileUtils autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     Properties {
         condition: qbs.toolchain.contains("gcc")
         cpp.cxxFlags: base.concat(["-Wno-trigraphs"])
diff --git a/tests/auto/utils/stringutils/stringutils.qbs b/tests/auto/utils/stringutils/stringutils.qbs
index be2f4ddb5527c6f723b43006cef22ba05edcd8c3..4a36fe9cb1f35aa7171fbf28eee7031b615d8b35 100644
--- a/tests/auto/utils/stringutils/stringutils.qbs
+++ b/tests/auto/utils/stringutils/stringutils.qbs
@@ -3,6 +3,5 @@ import qbs
 QtcAutotest {
     name: "StringUtils autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     files: "tst_stringutils.cpp"
 }
diff --git a/tests/auto/utils/treemodel/treemodel.qbs b/tests/auto/utils/treemodel/treemodel.qbs
index bc86fcb9ff06f540eefd172a16df4c63ab149a8c..4a1659e8b0e60fa09ec7cc7914bb8f45e5ccf7dc 100644
--- a/tests/auto/utils/treemodel/treemodel.qbs
+++ b/tests/auto/utils/treemodel/treemodel.qbs
@@ -3,6 +3,5 @@ import qbs
 QtcAutotest {
     name: "TreeModel autotest"
     Depends { name: "Utils" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     files: "tst_treemodel.cpp"
 }
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 1de90b646fc6daa099f137757aec695c026359eb..bf500d5042521df05bb50f492028562b8471801c 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -5,7 +5,6 @@ QtcAutotest {
     Depends { name: "QtcSsh" }
     Depends { name: "Utils" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"
 
     Group {