diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
index 8f55c8df5cba8769c0d193baea91cd45761cc4b7..875322014dd6f6676ac932c3e1eb92820e0b9a57 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
@@ -46,6 +46,7 @@ namespace Plugin1 {
 class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin1.json")
 
 public:
     MyPlugin1();
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
index 7f7c7e18a47ab883fd54ed711f5b0d64bcba076d..0c761b2e75e0492d715cf13286c89a661d01ad80 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
@@ -46,6 +46,7 @@ namespace Plugin2 {
 class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin2.json")
 
 public:
     MyPlugin2();
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h
index 5b47ebec9f79434111aadd3ac511e79ef1f69204..604f182cd0bca904b9c7dc24eca7871cb80272c8 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h
@@ -46,6 +46,7 @@ namespace Plugin3 {
 class PLUGIN3_EXPORT MyPlugin3 : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin3.json")
 
 public:
     MyPlugin3();
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h
index aa337fd20969390becbbe4e24a55ecbd6f5020ad..41f518d2acdae70b19061879811607733182d37d 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h
@@ -46,6 +46,7 @@ namespace Plugin1 {
 class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin1.json")
 
 public:
     MyPlugin1();
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h
index da65f75d0994d4427ef54f50026ef9b638c4deca..5f2143909b9d955524e447b50e3927f03a679add 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h
@@ -46,6 +46,7 @@ namespace Plugin2 {
 class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin2.json")
 
 public:
     MyPlugin2();
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h
index 5bafe2d41ec3fa16a66f9bee58340506c08b8348..7de6bbeccc9ec545ec074a275865a4ec0b989f07 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h
@@ -45,6 +45,7 @@ namespace Plugin3 {
 class PLUGIN3_EXPORT MyPlugin3 : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin3.json")
 
 public:
     MyPlugin3();
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
index 5abbb82c4d00b1fd3dedc91ba3d93c3938124513..74cf6c7343ad858035e4dac2707e7a43932ca6b4 100644
--- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
@@ -90,6 +90,7 @@ void tst_PluginManager::init()
 
 void tst_PluginManager::cleanup()
 {
+    m_pm->shutdown();
     delete m_pm;
     delete m_objectAdded;
     delete m_aboutToRemoveObject;