2 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 22ac9aa076..fc5a7d1fab 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -882,7 +882,7 @@ void tst_QTcpServer::serverAddress_data()
     QTest::addColumn<QHostAddress>("listenAddress");
     QTest::addColumn<QHostAddress>("serverAddress");
 #ifdef Q_OS_WIN
-    if (QSysInfo::windowsVersion() < QSysInfo::WV_6_0)
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::WindowsVista)
         QTest::newRow("Any") << QHostAddress(QHostAddress::Any) << QHostAddress(QHostAddress::AnyIPv4); //windows XP doesn't support dual stack sockets
     else
 #endif
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index c500c6b3c3..7733b0a62b 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -326,8 +326,8 @@ void tst_QTcpSocket::initTestCase_data()
     QTest::addColumn<bool>("ssl");
 
     QTest::newRow("WithoutProxy") << false << 0 << false;
-    //QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy) << false; ### temporarily disabled, QTBUG-38385
-    //QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic) << false; ### temporarily disabled, QTBUG-38385
+    QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy) << false;
+    QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic) << false;
 
     QTest::newRow("WithHttpProxy") << true << int(HttpProxy) << false;
     QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic) << false;
@@ -335,8 +335,8 @@ void tst_QTcpSocket::initTestCase_data()
 
 #ifndef QT_NO_SSL
     QTest::newRow("WithoutProxy SSL") << false << 0 << true;
-    //QTest::newRow("WithSocks5Proxy SSL") << true << int(Socks5Proxy) << true; ### temporarily disabled, QTBUG-38385
-    //QTest::newRow("WithSocks5AuthProxy SSL") << true << int(Socks5Proxy | AuthBasic) << true; ### temporarily disabled, QTBUG-38385
+    QTest::newRow("WithSocks5Proxy SSL") << true << int(Socks5Proxy) << true;
+    QTest::newRow("WithSocks5AuthProxy SSL") << true << int(Socks5Proxy | AuthBasic) << true;
 
     QTest::newRow("WithHttpProxy SSL") << true << int(HttpProxy) << true;
     QTest::newRow("WithHttpProxyBasicAuth SSL") << true << int(HttpProxy | AuthBasic) << true;
@@ -865,7 +865,8 @@ void tst_QTcpSocket::hostNotFound()
     QCOMPARE(socket->state(), QTcpSocket::UnconnectedState);
 #ifdef QT_TEST_SERVER
     QFETCH_GLOBAL(bool, setProxy);
-    if (setProxy) {
+    QFETCH_GLOBAL(int, proxyType);
+    if (setProxy && (proxyType & HttpProxy) == HttpProxy) {
         QEXPECT_FAIL("", "QTBUG-73953: The version of Squid in the docker container behaves "
                          "differently to the one in the network testing server, returning 503 "
                          "when we expect 404", Continue);