5 files changed, 19 insertions, 25 deletions
diff --git a/tests/auto/corelib/global/global.pro b/tests/auto/corelib/global/global.pro
index 0f77d191ee..0b37bf63cf 100644
--- a/tests/auto/corelib/global/global.pro
+++ b/tests/auto/corelib/global/global.pro
@@ -13,5 +13,5 @@ SUBDIRS=\
     qglobalstatic \
     qhooks
 
-win32:!winrt: SUBDIRS += \
+win32: SUBDIRS += \
     qwinregistry
diff --git a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
index 544cb1bf07..8cc66c6477 100644
--- a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
+++ b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
@@ -135,9 +135,7 @@ void tst_QGetPutEnv::encoding()
     static const wchar_t rawvalue[] = { 'a', 0x00E1, 0x03B1, 0x0430, 0 };
     QString value = QString::fromWCharArray(rawvalue);
 
-#if defined(Q_OS_WINRT)
-    QSKIP("Test cannot be run on this platform");
-#elif defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
     const wchar_t wvarName[] = L"should_not_exist";
     _wputenv_s(wvarName, rawvalue);
 #else
diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt
index 7c74656215..ce9235f91e 100644
--- a/tests/auto/corelib/global/qlogging/CMakeLists.txt
+++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt
@@ -1,19 +1,17 @@
-if(NOT WINRT)
-    add_qt_executable(qlogging_helper
-        NO_INSTALL # special case
-        OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
-        SOURCES app/main.cpp
-        DEFINES QT_MESSAGELOGCONTEXT
-        LIBRARIES Qt::Core)
+add_qt_executable(qlogging_helper
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES app/main.cpp
+    DEFINES QT_MESSAGELOGCONTEXT
+    LIBRARIES Qt::Core)
 
-    #special case begin
-    # Fixes required for the backtrace stack to be correct
-    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
-        target_link_options(qlogging_helper PRIVATE -rdynamic)
-    endif()
-    set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
-    # special case end
+#special case begin
+# Fixes required for the backtrace stack to be correct
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
+    target_link_options(qlogging_helper PRIVATE -rdynamic)
 endif()
+set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
+# special case end
 
 add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp
     DEFINES
diff --git a/tests/auto/corelib/global/qlogging/qlogging.pro b/tests/auto/corelib/global/qlogging/qlogging.pro
index bbe75297d5..c81e257a2d 100644
--- a/tests/auto/corelib/global/qlogging/qlogging.pro
+++ b/tests/auto/corelib/global/qlogging/qlogging.pro
@@ -1,8 +1,6 @@
 TEMPLATE = subdirs
 
-!winrt {
-    test.depends = app
-    SUBDIRS += app
-}
+test.depends = app
+SUBDIRS += app
 
 SUBDIRS += test
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 81445247e0..c6c5950ff1 100644
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -4,14 +4,14 @@ qtConfig(c++14): CONFIG += c++14
 debug_and_release {
     CONFIG(debug, debug|release) {
         TARGET = ../../debug/tst_qlogging
-        !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
+        !android: TEST_HELPER_INSTALLS = ../debug/helper
     } else {
         TARGET = ../../release/tst_qlogging
-        !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
+        !android: TEST_HELPER_INSTALLS = ../release/helper
     }
 } else {
     TARGET = ../tst_qlogging
-    !android:!winrt: TEST_HELPER_INSTALLS = ../helper
+    !android: TEST_HELPER_INSTALLS = ../helper
 }
 
 QT = core testlib