2 files changed, 20 insertions, 31 deletions
diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
index 4e231cc6cc..cc19461d7a 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
@@ -4,17 +4,6 @@
 ## tst_qfontdialog Test:
 #####################################################################
 
-qt_internal_add_test(tst_qfontdialog
-    SOURCES
-        tst_qfontdialog.cpp
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::Widgets
-        Qt::WidgetsPrivate
-)
-
 # Resources:
 set_source_files_properties("../../../shared/resources/test.ttf"
     PROPERTIES QT_RESOURCE_ALIAS "test.ttf"
@@ -27,13 +16,18 @@ set(testfonts_resource_files
     "../../../shared/resources/testfont.ttf"
 )
 
-qt_internal_add_resource(tst_qfontdialog "testfonts"
-    PREFIX
-        "/"
-    FILES
-        ${testfonts_resource_files}
+qt_internal_add_test(tst_qfontdialog
+    SOURCES
+        tst_qfontdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${testfonts_resource_files}
+    BUILTIN_TESTDATA
 )
 
-
 ## Scopes:
 #####################################################################
diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
index 81dc9e85b2..32fc41f5c9 100644
--- a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
+++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
@@ -4,15 +4,6 @@
 ## tst_qwizard Test:
 #####################################################################
 
-qt_internal_add_test(tst_qwizard
-    SOURCES
-        tst_qwizard.cpp
-        tst_qwizard_2.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Widgets
-)
-
 # Resources:
 set(qwizard_resource_files
     "images/background.png"
@@ -21,10 +12,14 @@ set(qwizard_resource_files
     "images/watermark.png"
 )
 
-qt_internal_add_resource(tst_qwizard "qwizard"
-    PREFIX
-        "/"
-    FILES
-        ${qwizard_resource_files}
+qt_internal_add_test(tst_qwizard
+    SOURCES
+        tst_qwizard.cpp
+        tst_qwizard_2.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    TESTDATA ${qwizard_resource_files}
+    BUILTIN_TESTDATA
 )