diff --git a/tests/baseline/painting/tst_baseline_painting.cpp b/tests/baseline/painting/tst_baseline_painting.cpp
index c8de08e7d28..d81f4468dcf 100644
--- a/tests/baseline/painting/tst_baseline_painting.cpp
+++ b/tests/baseline/painting/tst_baseline_painting.cpp
@@ -55,6 +55,7 @@ private:
 private slots:
     void initTestCase();
     void init();
+    void cleanupTestCase();
 
     void testRasterARGB32PM_data();
     void testRasterARGB32PM();
@@ -139,6 +140,11 @@ void tst_Lancelot::init()
     QBASELINE_SKIP_IF_BLACKLISTED;
 }
 
+void tst_Lancelot::cleanupTestCase()
+{
+    QBaselineTest::finalizeAndDisconnect();
+}
+
 void tst_Lancelot::testRasterARGB32PM_data()
 {
     setupTestSuite();
diff --git a/tests/baseline/shared/qwidgetbaselinetest.cpp b/tests/baseline/shared/qwidgetbaselinetest.cpp
index 72a074e2681..f0d3da9e13c 100644
--- a/tests/baseline/shared/qwidgetbaselinetest.cpp
+++ b/tests/baseline/shared/qwidgetbaselinetest.cpp
@@ -100,6 +100,11 @@ void QWidgetBaselineTest::cleanup()
     window = nullptr;
 }
 
+void QWidgetBaselineTest::cleanupTestCase()
+{
+    QBaselineTest::finalizeAndDisconnect();
+}
+
 void QWidgetBaselineTest::makeVisible()
 {
     Q_ASSERT(window);
diff --git a/tests/baseline/shared/qwidgetbaselinetest.h b/tests/baseline/shared/qwidgetbaselinetest.h
index 2142217c09a..4bb4faa12e5 100644
--- a/tests/baseline/shared/qwidgetbaselinetest.h
+++ b/tests/baseline/shared/qwidgetbaselinetest.h
@@ -28,6 +28,7 @@ private slots:
     void initTestCase();
     void init();
     void cleanup();
+    void cleanupTestCase();
 
 protected:
     void makeVisible();