diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 819864cea8..5493219442 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -2,17 +2,19 @@
 # Test ScreenPaintData
 ########################################################
 set( testScreenPaintData_SRCS test_screen_paint_data.cpp )
-kde4_add_unit_test( testScreenPaintData TESTNAME kwin-TestScreenPaintData ${testScreenPaintData_SRCS} )
-
+add_executable(testScreenPaintData ${testScreenPaintData_SRCS})
 target_link_libraries( testScreenPaintData kwineffects Qt5::Test Qt5::Widgets)
+add_test(kwin-testScreenPaintData testScreenPaintData)
+ecm_mark_as_test(testScreenPaintData)
 
 ########################################################
 # Test WindowPaintData
 ########################################################
 set( testWindowPaintData_SRCS test_window_paint_data.cpp )
-kde4_add_unit_test( testWindowPaintData TESTNAME kwin-TestWindowPaintData ${testWindowPaintData_SRCS} )
-
+add_executable(testWindowPaintData ${testWindowPaintData_SRCS})
 target_link_libraries( testWindowPaintData kwineffects Qt5::Widgets Qt5::Test )
+add_test(kwin-testWindowPaintData testWindowPaintData)
+ecm_mark_as_test(testWindowPaintData)
 
 ########################################################
 # Test VirtualDesktopManager
@@ -21,7 +23,7 @@ set( testVirtualDesktops_SRCS
      test_virtual_desktops.cpp
      ../virtualdesktops.cpp
 )
-kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} )
+add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
 
 target_link_libraries( testVirtualDesktops
                        Qt5::Test
@@ -31,6 +33,8 @@ target_link_libraries( testVirtualDesktops
                        KF5::ConfigCore
                        KF5::WindowSystem
 )
+add_test(kwin-testVirtualDesktops testVirtualDesktops)
+ecm_mark_as_test(testVirtualDesktops)
 
 ########################################################
 # Test ClientMachine
@@ -42,7 +46,7 @@ set( testClientMachine_SRCS
      ../atoms.cpp # needed by utils.cpp
      ../cursor.cpp # needed by utils.cpp
 )
-kde4_add_unit_test( testClientMachine TESTNAME kwin-TestClientMachine ${testClientMachine_SRCS} )
+add_executable( testClientMachine ${testClientMachine_SRCS} )
 
 target_link_libraries( testClientMachine
                        Qt5::Concurrent
@@ -56,6 +60,8 @@ target_link_libraries( testClientMachine
                        ${X11_X11_LIB} # to make jenkins happy
                        ${X11_Xcursor_LIB}
 )
+add_test(kwin-testClientMachine testClientMachine)
+ecm_mark_as_test(testClientMachine)
 
 ########################################################
 # Test XcbWrapper
@@ -63,7 +69,7 @@ target_link_libraries( testClientMachine
 set( testXcbWrapper_SRCS
      test_xcb_wrapper.cpp
 )
-kde4_add_unit_test( testXcbWrapper TESTNAME kwin-TestXcbWrapper ${testXcbWrapper_SRCS} )
+add_executable( testXcbWrapper ${testXcbWrapper_SRCS} )
 
 target_link_libraries( testXcbWrapper
                        Qt5::Test
@@ -71,6 +77,8 @@ target_link_libraries( testXcbWrapper
                        Qt5::Widgets
                        XCB::XCB
 )
+add_test(kwin-testXcbWrapper testXcbWrapper)
+ecm_mark_as_test(testXcbWrapper)
 
 ########################################################
 # Test XcbWindow
@@ -78,7 +86,7 @@ target_link_libraries( testXcbWrapper
 set( testXcbWindow_SRCS
      test_xcb_window.cpp
 )
-kde4_add_unit_test( testXcbWindow TESTNAME kwin-TestXcbWindow ${testXcbWindow_SRCS} )
+add_executable( testXcbWindow ${testXcbWindow_SRCS} )
 
 target_link_libraries( testXcbWindow
                        Qt5::Test
@@ -86,3 +94,5 @@ target_link_libraries( testXcbWindow
                        Qt5::Widgets
                        XCB::XCB
 )
+add_test(kwin-testXcbWindow testXcbWindow)
+ecm_mark_as_test(testXcbWindow)
diff --git a/tabbox/autotests/CMakeLists.txt b/tabbox/autotests/CMakeLists.txt
index 860f2c928d..4e83fa7524 100644
--- a/tabbox/autotests/CMakeLists.txt
+++ b/tabbox/autotests/CMakeLists.txt
@@ -42,8 +42,10 @@ set( testTabBoxConfig_SRCS
     test_tabbox_config.cpp
 )
 
-kde4_add_unit_test( testTabBoxConfig TESTNAME kwin-testTabBoxConfig ${testTabBoxConfig_SRCS} )
+add_executable( testTabBoxConfig ${testTabBoxConfig_SRCS} )
 target_link_libraries( testTabBoxConfig Qt5::Core Qt5::Test )
+add_test(kwin-testTabBoxConfig testTabBoxConfig)
+ecm_mark_as_test(testTabBoxConfig)
 
 
 ########################################################
@@ -54,5 +56,7 @@ set( testDesktopChain_SRCS
     test_desktopchain.cpp
 )
 
-kde4_add_unit_test( testDesktopChain TESTNAME kwin-testDesktopChain ${testDesktopChain_SRCS} )
+add_executable( testDesktopChain ${testDesktopChain_SRCS} )
 target_link_libraries( testDesktopChain Qt5::Core Qt5::Test )
+add_test(kwin-testDesktopChain testDesktopChain)
+ecm_mark_as_test(testDesktopChain)