diff --git a/autotests/test_client_machine.cpp b/autotests/test_client_machine.cpp
index d19b82a55f..cc37350c74 100644
--- a/autotests/test_client_machine.cpp
+++ b/autotests/test_client_machine.cpp
@@ -151,5 +151,5 @@ void TestClientMachine::emptyHostName()
     QCOMPARE(spy.isEmpty(), false);
 }
 
-KWIN_TEST_MAIN(TestClientMachine)
+QTEST_MAIN(TestClientMachine)
 #include "test_client_machine.moc"
diff --git a/autotests/test_xcb_size_hints.cpp b/autotests/test_xcb_size_hints.cpp
index 79d1a379fa..1c00096666 100644
--- a/autotests/test_xcb_size_hints.cpp
+++ b/autotests/test_xcb_size_hints.cpp
@@ -371,5 +371,5 @@ void TestXcbSizeHints::geometryHintsBeforeRead()
     QCOMPARE(hints.windowGravity(), XCB_GRAVITY_NORTH_WEST);
 }
 
-KWIN_TEST_MAIN(TestXcbSizeHints)
+QTEST_MAIN(TestXcbSizeHints)
 #include "test_xcb_size_hints.moc"
diff --git a/autotests/test_xcb_window.cpp b/autotests/test_xcb_window.cpp
index 9d263fa360..8b1ec4a5b4 100644
--- a/autotests/test_xcb_window.cpp
+++ b/autotests/test_xcb_window.cpp
@@ -207,5 +207,5 @@ void TestXcbWindow::destroyNotManaged()
     QVERIFY(attribs);
 }
 
-KWIN_TEST_MAIN(TestXcbWindow)
+QTEST_MAIN(TestXcbWindow)
 #include "test_xcb_window.moc"
diff --git a/autotests/test_xcb_wrapper.cpp b/autotests/test_xcb_wrapper.cpp
index 1fe1934c23..4c14cde432 100644
--- a/autotests/test_xcb_wrapper.cpp
+++ b/autotests/test_xcb_wrapper.cpp
@@ -525,5 +525,5 @@ void TestXcbWrapper::testMotif()
     QTEST(hints.close(), "expectedClose");
 }
 
-KWIN_TEST_MAIN(TestXcbWrapper)
+QTEST_MAIN(TestXcbWrapper)
 #include "test_xcb_wrapper.moc"
diff --git a/autotests/testutils.h b/autotests/testutils.h
index d0154104d9..7fff8c49b5 100644
--- a/autotests/testutils.h
+++ b/autotests/testutils.h
@@ -24,14 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // XCB
 #include <xcb/xcb.h>
 
-// like QTEST_MAIN, just using a QApplication for X11 interaction
-#define KWIN_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) { \
-    QApplication app(argc, argv); \
-    TestObject tc; \
-    return QTest::qExec(&tc, argc, argv); \
-}
-
 namespace KWin {
 
 /**