diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91ea2331..6707c79f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,135 +1,135 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(KF5_VERSION "5.68.0") # handled by release scripts
 set(KF5_DEP_VERSION "5.67.0") # handled by release scripts
 
 project(kirigami2 VERSION ${KF5_VERSION})
 
 set(REQUIRED_QT_VERSION 5.12.0)
 
 SET(CMAKE_CXX_STANDARD 11)
 
 ################# Disallow in-source build #################
 
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
    message(FATAL_ERROR "kirigami requires an out of source build. Please create a separate build directory and run 'cmake path_to_kirigami [options]' there.")
 endif()
 
 option(BUILD_SHARED_LIBS "Build a shared module" ON)
 option(DESKTOP_ENABLED "Build and install The Desktop style" ON)
 option(STATIC_LIBRARY "Build as a static library (deprecated, use BUILD_SHARED_LIBS instead)" OFF)
 option(BUILD_EXAMPLES "Build and install examples" OFF)
 option(DISABLE_DBUS "Build without D-Bus support" OFF)
 
 if(NOT BUILD_SHARED_LIBS)
     set(STATIC_LIBRARY 1)
 elseif(STATIC_LIBRARY)
     set(BUILD_SHARED_LIBS 0)
 endif()
 
 # Make CPack available to easy generate binary packages
 include(CPack)
 include(FeatureSummary)
 
 find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Gui Svg QuickControls2)
 if (BUILD_TESTING)
-    find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
+    find_package(Qt5QuickTest ${REQUIRED_QT_VERSION} CONFIG QUIET)
 endif()
 add_definitions(-DQT_NO_FOREACH)
 set(CMAKE_AUTOMOC ON)
 set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.kirigami)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 if(STATIC_LIBRARY)
     add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC)
     add_definitions(-DQT_PLUGIN)
     add_definitions(-DQT_STATICPLUGIN=1)
 endif(STATIC_LIBRARY)
 
 ################# set KDE specific information #################
 
 find_package(ECM 5.67.0 NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(GenerateExportHeader)
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(ECMPoQmTools)
 include(ECMQMLModules)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddQch)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDEPackageAppTemplates)
 
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Kirigami2")
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
 
 configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KF5Kirigami2Config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KF5Kirigami2Config.cmake"
     INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
     PATH_VARS  KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
 )
 
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/KF5Kirigami2Config.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/KF5Kirigami2ConfigVersion.cmake"
     "${CMAKE_CURRENT_SOURCE_DIR}/KF5Kirigami2Macros.cmake"
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     COMPONENT Devel
 )
 
 install(EXPORT KF5Kirigami2Targets
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     FILE KF5Kirigami2Targets.cmake
     NAMESPACE KF5::
 )
 
 
 ecm_setup_version(${KF5_VERSION}
     VARIABLE_PREFIX KIRIGAMI2
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kirigami_version.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5Kirigami2ConfigVersion.cmake"
     SOVERSION 5
 )
 
 #use dbus on linux, bsd etc, but not andoid and apple stuff
 if (UNIX AND NOT ANDROID AND NOT(APPLE) AND NOT(DISABLE_DBUS))
     find_package(Qt5DBus)
     add_definitions(-DKIRIGAMI_ENABLE_DBUS)
 endif()
 
 if(BUILD_EXAMPLES AND ANDROID)
     find_package(Qt5AndroidExtras ${REQUIRED_QT_VERSION} REQUIRED)
 endif()
 
 
 ecm_find_qmlmodule(QtGraphicalEffects 1.0)
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
 add_subdirectory(src)
 if (NOT ANDROID)
     add_subdirectory(templates)
 endif()
 
 if (BUILD_EXAMPLES AND NOT STATIC_LIBRARY)
     add_subdirectory(examples)
 endif()
 
 if (BUILD_TESTING AND NOT STATIC_LIBRARY)
     add_subdirectory(autotests)
 endif()
 
 if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
     ecm_install_po_files_as_qm(po)
 endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 955a4a6c..317cd3a0 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,21 +1,31 @@
-if(NOT Qt5Test_FOUND)
-    message(STATUS "Qt5Test not found, autotests will not be built.")
+if(NOT Qt5QuickTest_FOUND)
+    message(STATUS "Qt5QuickTest not found, autotests will not be built.")
     return()
 endif()
 
+add_executable(qmltest qmltest.cpp)
+target_link_libraries(qmltest Qt5::QuickTest)
+
 macro(kirigami_add_tests)
+    if (WIN32)
+        set(_extra_args -platform offscreen)
+    endif()
+
     foreach(test ${ARGV})
         add_test(NAME ${test}
-                 COMMAND qmltestrunner -import ${CMAKE_BINARY_DIR}/bin -input ${test}
+                 COMMAND qmltest
+                        ${_extra_args}
+                        -import ${CMAKE_BINARY_DIR}/bin
+                        -input ${test}
                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )
     endforeach()
 endmacro()
 
 kirigami_add_tests(
     tst_keynavigation.qml
     tst_listskeynavigation.qml
     tst_pagerow.qml
     tst_icon.qml
 )
 
diff --git a/autotests/qmltest.cpp b/autotests/qmltest.cpp
new file mode 100644
index 00000000..eef3def3
--- /dev/null
+++ b/autotests/qmltest.cpp
@@ -0,0 +1,8 @@
+/*
+ *  SPDX-FileCopyrightText: 2020 Arjen Hiemstra <ahiemstra@heimr.nl>
+ *
+ *  SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+
+#include <QtQuickTest>
+QUICK_TEST_MAIN(Kirigami)