2 files changed, 6 insertions, 10 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 02757888ee..5aa73456ef 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -144,10 +144,8 @@ private slots:
     void mapRectToScene();
     void mapRectFromScene_data();
     void mapRectFromScene();
-#ifndef Q_WS_WINCE_WM
     void chipTester_data();
     void chipTester();
-#endif
     void deepNesting_data();
     void deepNesting();
     void imageRiver_data();
@@ -397,8 +395,6 @@ void tst_QGraphicsView::mapRectFromScene()
     }
 }
 
-// This test does not make sense Windows Mobile without OpenGL
-#ifndef Q_WS_WINCE_WM
 void tst_QGraphicsView::chipTester_data()
 {
     QTest::addColumn<bool>("antialias");
@@ -420,6 +416,9 @@ void tst_QGraphicsView::chipTester_data()
 
 void tst_QGraphicsView::chipTester()
 {
+#ifdef Q_WS_WINCE_WM
+    QSKIP("WinCE WM: Fails on Windows Mobile w/o OpenGL");
+#endif
     QFETCH(bool, antialias);
     QFETCH(bool, opengl);
     QFETCH(int, operation);
@@ -437,7 +436,6 @@ void tst_QGraphicsView::chipTester()
         tester.runBenchmark();
     }
 }
-#endif
 
 static void addChildHelper(QGraphicsItem *parent, int n, bool rotate)
 {
diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
index 842e2750b0..b7106edb76 100644
--- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -74,9 +74,7 @@ public slots:
     void cleanup();
 private slots:
     void ipv4LoopbackPerformanceTest();
-#ifndef Q_WS_WINCE_WM
     void ipv6LoopbackPerformanceTest();
-#endif
     void ipv4PerformanceTest();
 };
 
@@ -167,13 +165,14 @@ void tst_QTcpServer::ipv4LoopbackPerformanceTest()
 }
 
 //----------------------------------------------------------------------------------
-// IPv6 loopback not yet supported on Windows Mobile
-#ifndef Q_WS_WINCE_WM
 void tst_QTcpServer::ipv6LoopbackPerformanceTest()
 {
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;
+#if defined(Q_WS_WINCE_WM)
+    QSKIP("WinCE WM: Not yet supported");
+#endif
 
     QTcpServer server;
     if (!server.listen(QHostAddress::LocalHostIPv6, 0)) {
@@ -218,7 +217,6 @@ void tst_QTcpServer::ipv6LoopbackPerformanceTest()
         delete clientB;
     }
 }
-#endif
 
 //----------------------------------------------------------------------------------
 void tst_QTcpServer::ipv4PerformanceTest()