diff --git a/src/libs/utils/stringtable.cpp b/src/libs/utils/stringtable.cpp
index 90c97d7ba40..f53a1dd2127 100644
--- a/src/libs/utils/stringtable.cpp
+++ b/src/libs/utils/stringtable.cpp
@@ -11,10 +11,9 @@
 #include <QSet>
 #include <QTimer>
 
-// FIXME: Re-create in better location?
-//#ifdef WITH_TESTS
-//#include <extensionsystem/pluginmanager.h>
-//#endif
+// FIXME: Provide tst_StringTable that would run GC, make a sleep inside GC being run in other
+// thread and execute destructor of StringTable in main thread. In this case the test should
+// ensure that destructor of StringTable waits for its internal thread to finish.
 
 namespace Utils::StringTable {
 
@@ -116,13 +115,6 @@ static inline bool isQStringInUse(const QString &string)
 
 void StringTablePrivate::GC(QFutureInterface<void> &futureInterface)
 {
-//#ifdef WITH_TESTS
-//    if (ExtensionSystem::PluginManager::isScenarioRunning("TestStringTable")) {
-//        if (ExtensionSystem::PluginManager::finishScenario())
-//            QThread::sleep(5);
-//    }
-//#endif
-
     int initialSize = 0;
     bytesSaved = 0;
     QElapsedTimer timer;
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index 3c9fbbcad5b..98fff3472dc 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -283,8 +283,6 @@ bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorStri
 
     dd = new AutotestPluginPrivate;
 #ifdef WITH_TESTS
-    ExtensionSystem::PluginManager::registerScenario("TestStringTable",
-                   [] { return dd->m_loadProjectScenario(); });
     ExtensionSystem::PluginManager::registerScenario("TestModelManagerInterface",
                    [] { return dd->m_loadProjectScenario(); });
 #endif
diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp
index 24b76567680..f2cf192ab30 100644
--- a/src/plugins/autotest/autotestunittests.cpp
+++ b/src/plugins/autotest/autotestunittests.cpp
@@ -291,11 +291,6 @@ static int executeScenario(const QString &scenario)
     return QProcess::execute(data.m_executable, data.m_args + additionalArgs);
 }
 
-void AutoTestUnitTests::testStringTable()
-{
-    QCOMPARE(executeScenario("TestStringTable"), 0);
-}
-
 void AutoTestUnitTests::testModelManagerInterface()
 {
     QCOMPARE(executeScenario("TestModelManagerInterface"), 0);
diff --git a/src/plugins/autotest/autotestunittests.h b/src/plugins/autotest/autotestunittests.h
index 9be2433b37a..374477cd892 100644
--- a/src/plugins/autotest/autotestunittests.h
+++ b/src/plugins/autotest/autotestunittests.h
@@ -33,7 +33,6 @@ private slots:
     void testCodeParserGTest_data();
     void testCodeParserBoostTest();
     void testCodeParserBoostTest_data();
-    void testStringTable();
     void testModelManagerInterface();
 
 private: