diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index 14ec713d69d..292ed257aff 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -153,6 +153,8 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter()
     QFETCH(QString, searchText);
     QFETCH(ResultDataList, expectedResults);
 
+    Tests::VerifyCleanCppModelManager verify;
+
     CppLocatorFilterTestCase(filter, testFile, searchText, expectedResults);
 }
 
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index 2f176dd4337..8258dcf7103 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -628,7 +628,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles()
     QVERIFY(temporaryDir.isValid());
     const QString projectFile = temporaryDir.absolutePath("testdata_guiproject1.pro");
 
-    ProjectOpenerAndCloser projects(/*waitForFinishedGcOnDestruction=*/ true);
+    ProjectOpenerAndCloser projects;
     ProjectInfo projectInfo = projects.open(projectFile, /*configureAsExampleProject=*/ true);
     QVERIFY(projectInfo.isValid());
 
diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h
index 458e62b5cf2..bbe46298582 100644
--- a/src/plugins/cpptools/cpptoolstestcase.h
+++ b/src/plugins/cpptools/cpptoolstestcase.h
@@ -111,7 +111,7 @@ class CPPTOOLS_EXPORT ProjectOpenerAndCloser : public QObject
     Q_OBJECT
 
 public:
-    ProjectOpenerAndCloser(bool waitForFinishedGcOnDestruction = false);
+    ProjectOpenerAndCloser(bool waitForFinishedGcOnDestruction = true);
     ~ProjectOpenerAndCloser(); // Closes opened projects
 
     ProjectInfo open(const QString &projectFile, bool configureAsExampleProject = false);
@@ -138,7 +138,7 @@ private:
     bool m_isValid;
 };
 
-class VerifyCleanCppModelManager
+class CPPTOOLS_EXPORT VerifyCleanCppModelManager
 {
 public:
     VerifyCleanCppModelManager() { verify(); }
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
index 600c7d29092..1a74608f9ee 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
@@ -60,6 +60,8 @@ inline QString sourceProjectPath(const QString &project)
 
 void GenericProjectPlugin::test_simple()
 {
+    Tests::VerifyCleanCppModelManager verify;
+
     TemporaryCopiedDir temporaryDir(sourceProjectPath(_("testdata_simpleproject")));
     QVERIFY(temporaryDir.isValid());
     const QString mainFile = temporaryDir.absolutePath("main.cpp");
@@ -93,6 +95,8 @@ static QStringList simplify(const QList<CppTools::ProjectFile> &files, const QSt
 
 void GenericProjectPlugin::test_mixed1()
 {
+    Tests::VerifyCleanCppModelManager verify;
+
     TemporaryCopiedDir temporaryDir(sourceProjectPath(_("testdata_mixedproject1/")));
     QVERIFY(temporaryDir.isValid());
     const QString projectFile = temporaryDir.absolutePath("mixedproject1.creator");
@@ -140,6 +144,8 @@ void GenericProjectPlugin::test_mixed1()
 
 void GenericProjectPlugin::test_mixed2()
 {
+    Tests::VerifyCleanCppModelManager verify;
+
     TemporaryCopiedDir temporaryDir(sourceProjectPath(_("testdata_mixedproject2/")));
     QVERIFY(temporaryDir.isValid());
     const QString projectFile = temporaryDir.absolutePath("mixedproject2.creator");