diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index ceb24837234ceb1a492b30341a9dfaff6277a658..14f249142875cced1d173e842fd61183dc8da812 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -1,8 +1,6 @@
 MODULE = webenginecore
 TARGET = QtWebEngineCore
 
-CMAKE_MODULE_TESTS = "-"
-
 QT += qml quick
 QT_PRIVATE += gui-private
 
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 6f48e9d49f6b7fb0e59a1d5d377007f93f996aef..4c460669085d8942d9d1f3b842702416e4f6a8a2 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -1,7 +1,5 @@
 TARGET = QtWebEngine
 
-CMAKE_MODULE_TESTS = "-"
-
 # For our export macros
 DEFINES += QT_BUILD_WEBENGINE_LIB
 
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 71240cbaf34628e3ae18e3e5e1614ac557db9e2a..4da888baa78313923c37bd4b542851368f203fe0 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -1,7 +1,5 @@
 TARGET = QtWebEngineWidgets
 
-CMAKE_MODULE_TESTS = "-"
-
 # For our export macros
 DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB
 
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d3c0651d1853ff3b98ca90403c92055008445ac9
--- /dev/null
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+project(qmake_cmake_files)
+
+enable_testing()
+
+find_package(Qt5Core REQUIRED)
+
+include("${_Qt5CTestMacros}")
+
+if (NOT NO_WIDGETS)
+    test_module_includes(
+      WebEngineWidgets QWebEngineView
+    )
+endif()
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
new file mode 100644
index 0000000000000000000000000000000000000000..51d30da67b68ddcf2269d8052b4b14cd5593b04e
--- /dev/null
+++ b/tests/auto/cmake/cmake.pro
@@ -0,0 +1,8 @@
+
+# Cause make to do nothing.
+TEMPLATE = subdirs
+
+CMAKE_QT_MODULES_UNDER_TEST = webengine
+qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST += webenginewidgets
+
+CONFIG += ctest_testcase