3 files changed, 14 insertions, 9 deletions
diff --git a/tests/auto/corelib/io/qiodevice/BLACKLIST b/tests/auto/corelib/io/qiodevice/BLACKLIST
deleted file mode 100644
index b8a61d3ca9..0000000000
--- a/tests/auto/corelib/io/qiodevice/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[unget]
-redhatenterpriselinuxworkstation-6.6
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
index ce15e80be5..18cae40663 100644
--- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -1,16 +1,23 @@
-# Generated from qiodevice.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qiodevice Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qiodevice LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 # Collect test data
 list(APPEND test_data "tst_qiodevice.cpp")
 
 qt_internal_add_test(tst_qiodevice
     SOURCES
         tst_qiodevice.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Network
     TESTDATA ${test_data}
     QT_TEST_SERVER_LIST "apache2" "cyrus"
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 07c2aa27b7..ad88d14bc9 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtCore/QCoreApplication>
 #include <QtNetwork/QtNetwork>
@@ -171,16 +171,16 @@ void tst_QIODevice::constructing_QFile()
 void tst_QIODevice::read_QByteArray()
 {
     QFile f(QFINDTESTDATA("tst_qiodevice.cpp"));
-    f.open(QIODevice::ReadOnly);
+    QVERIFY(f.open(QIODevice::ReadOnly));
 
     QByteArray b = f.read(10);
-    QCOMPARE(b.length(), 10);
+    QCOMPARE(b.size(), 10);
 
     b = f.read(256);
-    QCOMPARE(b.length(), 256);
+    QCOMPARE(b.size(), 256);
 
     b = f.read(0);
-    QCOMPARE(b.length(), 0);
+    QCOMPARE(b.size(), 0);
 }
 
 //--------------------------------------------------------------------