diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index 8e873785916..2c3dfdb28b0 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -41,12 +41,9 @@
 using namespace Core;
 using namespace ProjectExplorer;
 
-namespace {
-constexpr char setupMcuSupportKits[]{"SetupMcuSupportKits"};
-}
+namespace McuSupport::Internal {
 
-namespace McuSupport {
-namespace Internal {
+const char setupMcuSupportKits[] = "SetupMcuSupportKits";
 
 void printMessage(const QString &message, bool important)
 {
@@ -125,6 +122,10 @@ void McuSupportPlugin::initialize()
     dd->m_options.registerQchFiles();
     dd->m_options.registerExamples();
     ProjectExplorer::JsonWizardFactory::addWizardPath(":/mcusupport/wizards/");
+
+#if defined(WITH_TESTS) && defined(GOOGLE_TEST_IS_FOUND)
+    addTest<Test::McuSupportTest>();
+#endif
 }
 
 void McuSupportPlugin::extensionsInitialized()
@@ -189,14 +190,4 @@ void McuSupportPlugin::askUserAboutMcuSupportKitsUpgrade(const SettingsHandler::
     ICore::infoBar()->addInfo(info);
 }
 
-QVector<QObject *> McuSupportPlugin::createTestObjects() const
-{
-    QVector<QObject *> tests;
-#if defined(WITH_TESTS) && defined(GOOGLE_TEST_IS_FOUND)
-    tests << new Test::McuSupportTest;
-#endif
-    return tests;
-}
-
-} // namespace Internal
-} // namespace McuSupport
+} // McuSupport::Internal
diff --git a/src/plugins/mcusupport/mcusupportplugin.h b/src/plugins/mcusupport/mcusupportplugin.h
index 6db14cb63e9..08cfc61f890 100644
--- a/src/plugins/mcusupport/mcusupportplugin.h
+++ b/src/plugins/mcusupport/mcusupportplugin.h
@@ -24,10 +24,6 @@ public:
 
     void askUserAboutMcuSupportKitsSetup();
     static void askUserAboutMcuSupportKitsUpgrade(const SettingsHandler::Ptr &settingsHandler);
+};
 
-private:
-    QVector<QObject *> createTestObjects() const final;
-
-}; // class McuSupportPlugin
-
-} // namespace McuSupport::Internal
+} // McuSupport::Internal