3 files changed, 20 insertions, 10 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index c9c9202a80..e0d09b0813 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -30,7 +30,7 @@
 #include <QtTest/QtTest>
 #include <qdir.h>
 #include <qlibrary.h>
-#include <QtCore/QRegExp>
+#include <QtCore/QRegularExpression>
 
 
 // Helper macros to let us know if some suffixes and prefixes are valid
@@ -414,10 +414,12 @@ void tst_QLibrary::errorString()
             QFAIL(qPrintable(QString("Unknown operation: %1").arg(operation)));
             break;
     }
-    QRegExp re(errorString);
+#if QT_CONFIG(regularexpression)
+    QRegularExpression re(QRegularExpression::anchoredPattern(errorString));
     QString libErrorString = lib.errorString();
+    QVERIFY2(re.match(libErrorString).hasMatch(), qPrintable(libErrorString));
+#endif
     QVERIFY(!lib.isLoaded() || lib.unload());
-    QVERIFY2(re.exactMatch(libErrorString), qPrintable(libErrorString));
     QCOMPARE(ok, success);
 }
 
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index a290c012df..aa85a7c35b 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
@@ -41,7 +41,6 @@ class tst_QPlugin : public QObject
     Q_OBJECT
 
     QDir dir;
-    QString invalidPluginName;
 
 public:
     tst_QPlugin();
@@ -64,15 +63,14 @@ void tst_QPlugin::initTestCase()
     QVERIFY2(dir.exists(),
              qPrintable(QString::fromLatin1("Cannot find the 'plugins' directory starting from '%1'").
                         arg(QDir::toNativeSeparators(QDir::currentPath()))));
-
-    const auto fileNames = dir.entryList({"*invalid*"}, QDir::Files);
-    if (!fileNames.isEmpty())
-        invalidPluginName = dir.absoluteFilePath(fileNames.first());
 }
 
 void tst_QPlugin::loadDebugPlugin()
 {
     const auto fileNames = dir.entryList(QStringList() << "*debug*", QDir::Files);
+    if (fileNames.isEmpty())
+        QSKIP("No debug plugins found - skipping test");
+
     for (const QString &fileName : fileNames) {
         if (!QLibrary::isLibrary(fileName))
             continue;
@@ -100,6 +98,9 @@ void tst_QPlugin::loadDebugPlugin()
 void tst_QPlugin::loadReleasePlugin()
 {
     const auto fileNames = dir.entryList(QStringList() << "*release*", QDir::Files);
+    if (fileNames.isEmpty())
+        QSKIP("No release plugins found - skipping test");
+
     for (const QString &fileName : fileNames) {
         if (!QLibrary::isLibrary(fileName))
             continue;
@@ -227,7 +228,13 @@ static qsizetype locateMetadata(const uchar *data, qsizetype len)
 
 void tst_QPlugin::scanInvalidPlugin()
 {
-    QVERIFY(!invalidPluginName.isEmpty());
+    const auto fileNames = dir.entryList({"*invalid*"}, QDir::Files);
+    QString invalidPluginName;
+    if (fileNames.isEmpty())
+        QSKIP("No invalid plugin found - skipping test");
+    else
+        invalidPluginName = dir.absoluteFilePath(fileNames.first());
+
 
     // copy the file
     QFileInfo fn(invalidPluginName);
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index b06000d9c4..c4a366d7c6 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -549,7 +549,8 @@ void tst_QPluginLoader::staticPlugins()
     }
     QVERIFY(found);
 
-    QCOMPARE(metaData.value("version").toInt(), QT_VERSION);
+    // We don't store the patch release version anymore (since 5.13)
+    QCOMPARE(metaData.value("version").toInt() / 0x100, QT_VERSION / 0x100);
     QCOMPARE(metaData.value("IID").toString(), "SomeIID");
     QCOMPARE(metaData.value("ExtraMetaData"), QJsonArray({ "StaticPlugin", "foo" }));
     QCOMPARE(metaData.value("URI").toString(), "qt.test.pluginloader.staticplugin");