diff --git a/tests/baseline/shared/qwidgetbaselinetest.cpp b/tests/baseline/shared/qwidgetbaselinetest.cpp
index 504e5f432d3..9c642b7f48d 100644
--- a/tests/baseline/shared/qwidgetbaselinetest.cpp
+++ b/tests/baseline/shared/qwidgetbaselinetest.cpp
@@ -77,11 +77,14 @@ void QWidgetBaselineTest::initTestCase()
 void QWidgetBaselineTest::init()
 {
     QVERIFY(!window);
-    window = new QWidget;
+    background = new QWidget(nullptr, Qt::FramelessWindowHint);
+    window = new QWidget(background, Qt::Window);
     window->setWindowTitle(QTest::currentDataTag());
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    background->setScreen(QGuiApplication::primaryScreen());
     window->setScreen(QGuiApplication::primaryScreen());
 #endif
+    background->move(QGuiApplication::primaryScreen()->availableGeometry().topLeft());
     window->move(QGuiApplication::primaryScreen()->availableGeometry().topLeft());
 
     doInit();
@@ -91,13 +94,15 @@ void QWidgetBaselineTest::cleanup()
 {
     doCleanup();
 
-    delete window;
+    delete background;
+    background = nullptr;
     window = nullptr;
 }
 
 void QWidgetBaselineTest::makeVisible()
 {
     Q_ASSERT(window);
+    background->showMaximized();
     window->show();
     QApplicationPrivate::setActiveWindow(window);
     QVERIFY(QTest::qWaitForWindowActive(window));
diff --git a/tests/baseline/shared/qwidgetbaselinetest.h b/tests/baseline/shared/qwidgetbaselinetest.h
index 355d7d75a0b..2142217c09a 100644
--- a/tests/baseline/shared/qwidgetbaselinetest.h
+++ b/tests/baseline/shared/qwidgetbaselinetest.h
@@ -35,6 +35,7 @@ protected:
     QImage takeScreenSnapshot(const QRect& rect = QRect());
 
 private:
+    QWidget *background = nullptr;
     QWidget *window = nullptr;
 };