diff --git a/src/plugins/baremetal/CMakeLists.txt b/src/plugins/baremetal/CMakeLists.txt
index 7a25aa19598..71889e2eb60 100644
--- a/src/plugins/baremetal/CMakeLists.txt
+++ b/src/plugins/baremetal/CMakeLists.txt
@@ -8,7 +8,7 @@ add_qtc_plugin(BareMetal
     baremetaldeviceconfigurationwidget.cpp baremetaldeviceconfigurationwidget.h
     baremetaldeviceconfigurationwizard.cpp baremetaldeviceconfigurationwizard.h
     baremetaldeviceconfigurationwizardpages.cpp baremetaldeviceconfigurationwizardpages.h
-    baremetalplugin.cpp baremetalplugin.h
+    baremetalplugin.cpp
     baremetalrunconfiguration.cpp baremetalrunconfiguration.h
     baremetaltr.h
     debugserverproviderchooser.cpp debugserverproviderchooser.h
diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs
index d45090def37..d76c3d32e66 100644
--- a/src/plugins/baremetal/baremetal.qbs
+++ b/src/plugins/baremetal/baremetal.qbs
@@ -22,7 +22,7 @@ QtcPlugin {
             "baremetaldeviceconfigurationwidget.cpp", "baremetaldeviceconfigurationwidget.h",
             "baremetaldeviceconfigurationwizard.cpp", "baremetaldeviceconfigurationwizard.h",
             "baremetaldeviceconfigurationwizardpages.cpp", "baremetaldeviceconfigurationwizardpages.h",
-            "baremetalplugin.cpp", "baremetalplugin.h",
+            "baremetalplugin.cpp",
             "baremetalrunconfiguration.cpp", "baremetalrunconfiguration.h",
             "baremetaltr.h",
             "debugserverproviderchooser.cpp", "debugserverproviderchooser.h",
diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp
index 0f551623185..422cf123159 100644
--- a/src/plugins/baremetal/baremetalplugin.cpp
+++ b/src/plugins/baremetal/baremetalplugin.cpp
@@ -2,37 +2,52 @@
 // Copyright (C) 2016 Denis Shienkov <denis.shienkov@gmail.com>
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "baremetalplugin.h"
-
 #include "baremetaldebugsupport.h"
 #include "baremetaldevice.h"
 #include "baremetalrunconfiguration.h"
 
 #include "debugserverprovidermanager.h"
 
+#include "iarewparser.h"
 #include "iarewtoolchain.h"
+#include "keilparser.h"
 #include "keiltoolchain.h"
+#include "sdccparser.h"
 #include "sdcctoolchain.h"
 
+#include <extensionsystem/iplugin.h>
+
 namespace BareMetal::Internal {
 
-// BareMetalPlugin
-
-void BareMetalPlugin::initialize()
+class BareMetalPlugin final : public ExtensionSystem::IPlugin
 {
-    setupBareMetalDevice();
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "BareMetal.json")
 
-    setupIarToolChain();
-    setupKeilToolChain();
-    setupSdccToolChain();
+    void initialize() final
+    {
+        setupBareMetalDevice();
 
-    setupBareMetalDeployAndRunConfigurations();
-    setupBareMetalDebugSupport();
-}
+        setupIarToolChain();
+        setupKeilToolChain();
+        setupSdccToolChain();
 
-void BareMetalPlugin::extensionsInitialized()
-{
-    setupDebugServerProviderManager(this);
-}
+        setupBareMetalDeployAndRunConfigurations();
+        setupBareMetalDebugSupport();
+
+#ifdef WITH_TESTS
+        addTest<IarParserTest>();
+        addTest<KeilParserTest>();
+        addTest<SdccParserTest>();
+#endif
+    }
+
+    void extensionsInitialized() final
+    {
+        setupDebugServerProviderManager(this);
+    }
+};
 
 } // BareMetal::Internal
+
+#include "baremetalplugin.moc"
diff --git a/src/plugins/baremetal/baremetalplugin.h b/src/plugins/baremetal/baremetalplugin.h
deleted file mode 100644
index b529256b258..00000000000
--- a/src/plugins/baremetal/baremetalplugin.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2016 Tim Sander <tim@krieglstein.org>
-// Copyright (C) 2016 Denis Shienkov <denis.shienkov@gmail.com>
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace BareMetal::Internal {
-
-class BareMetalPlugin final : public ExtensionSystem::IPlugin
-{
-   Q_OBJECT
-   Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "BareMetal.json")
-
-   void initialize() final;
-   void extensionsInitialized() final;
-
-#ifdef WITH_TESTS
-private slots:
-   void testIarOutputParsers_data();
-   void testIarOutputParsers();
-   void testKeilOutputParsers_data();
-   void testKeilOutputParsers();
-   void testSdccOutputParsers_data();
-   void testSdccOutputParsers();
-#endif // WITH_TESTS
-};
-
-} // BareMetal::Internal
diff --git a/src/plugins/baremetal/iarewparser.cpp b/src/plugins/baremetal/iarewparser.cpp
index c883a4af417..35d56c50323 100644
--- a/src/plugins/baremetal/iarewparser.cpp
+++ b/src/plugins/baremetal/iarewparser.cpp
@@ -226,14 +226,12 @@ void IarParser::flush()
 // Unit tests:
 
 #ifdef WITH_TESTS
-#include "baremetalplugin.h"
 #include <projectexplorer/outputparser_test.h>
 #include <QTest>
 
-namespace BareMetal {
-namespace Internal {
+namespace BareMetal::Internal {
 
-void BareMetalPlugin::testIarOutputParsers_data()
+void IarParserTest::testIarOutputParsers_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<OutputParserTester::Channel>("inputChannel");
@@ -392,7 +390,7 @@ void BareMetalPlugin::testIarOutputParsers_data()
             << QString();
 }
 
-void BareMetalPlugin::testIarOutputParsers()
+void IarParserTest::testIarOutputParsers()
 {
     OutputParserTester testbench;
     testbench.addLineParser(new IarParser);
@@ -408,7 +406,6 @@ void BareMetalPlugin::testIarOutputParsers()
                           outputLines);
 }
 
-} // namespace Internal
-} // namespace BareMetal
+} // BareMetal::Internal
 
 #endif // WITH_TESTS
diff --git a/src/plugins/baremetal/iarewparser.h b/src/plugins/baremetal/iarewparser.h
index 3ed816f5e00..4c64e0b80f7 100644
--- a/src/plugins/baremetal/iarewparser.h
+++ b/src/plugins/baremetal/iarewparser.h
@@ -38,4 +38,15 @@ private:
     QStringList m_descriptionParts;
 };
 
+#ifdef WITH_TESTS
+class IarParserTest final : public QObject
+{
+   Q_OBJECT
+
+private slots:
+   void testIarOutputParsers_data();
+   void testIarOutputParsers();
+};
+#endif // WITH_TESTS
+
 } // BareMetal::Internal
diff --git a/src/plugins/baremetal/keilparser.cpp b/src/plugins/baremetal/keilparser.cpp
index cde30f1ecb7..5d42203c071 100644
--- a/src/plugins/baremetal/keilparser.cpp
+++ b/src/plugins/baremetal/keilparser.cpp
@@ -247,13 +247,13 @@ void KeilParser::flush()
 // Unit tests:
 
 #ifdef WITH_TESTS
-#include "baremetalplugin.h"
+
 #include <projectexplorer/outputparser_test.h>
 #include <QTest>
 
 namespace BareMetal::Internal {
 
-void BareMetalPlugin::testKeilOutputParsers_data()
+void KeilParserTest::testKeilOutputParsers_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<OutputParserTester::Channel>("inputChannel");
@@ -504,7 +504,7 @@ void BareMetalPlugin::testKeilOutputParsers_data()
             << QString();
 }
 
-void BareMetalPlugin::testKeilOutputParsers()
+void KeilParserTest::testKeilOutputParsers()
 {
     OutputParserTester testbench;
     testbench.addLineParser(new KeilParser);
diff --git a/src/plugins/baremetal/keilparser.h b/src/plugins/baremetal/keilparser.h
index 871e57f4ca8..3dd315fca8f 100644
--- a/src/plugins/baremetal/keilparser.h
+++ b/src/plugins/baremetal/keilparser.h
@@ -35,4 +35,15 @@ private:
     QStringList m_snippets;
 };
 
+#ifdef WITH_TESTS
+class KeilParserTest final : public QObject
+{
+   Q_OBJECT
+
+private slots:
+   void testKeilOutputParsers_data();
+   void testKeilOutputParsers();
+};
+#endif // WITH_TESTS
+
 } // BareMetal::Internal
diff --git a/src/plugins/baremetal/sdccparser.cpp b/src/plugins/baremetal/sdccparser.cpp
index 0612773c3ab..9115e3e5048 100644
--- a/src/plugins/baremetal/sdccparser.cpp
+++ b/src/plugins/baremetal/sdccparser.cpp
@@ -141,13 +141,12 @@ void SdccParser::flush()
 // Unit tests:
 
 #ifdef WITH_TESTS
-#include "baremetalplugin.h"
 #include <projectexplorer/outputparser_test.h>
 #include <QTest>
 
 namespace BareMetal::Internal {
 
-void BareMetalPlugin::testSdccOutputParsers_data()
+void SdccParserTest::testSdccOutputParsers_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<OutputParserTester::Channel>("inputChannel");
@@ -291,7 +290,7 @@ void BareMetalPlugin::testSdccOutputParsers_data()
             << QString();
 }
 
-void BareMetalPlugin::testSdccOutputParsers()
+void SdccParserTest::testSdccOutputParsers()
 {
     OutputParserTester testbench;
     testbench.addLineParser(new SdccParser);
diff --git a/src/plugins/baremetal/sdccparser.h b/src/plugins/baremetal/sdccparser.h
index e2f089c1138..b2f904dfcde 100644
--- a/src/plugins/baremetal/sdccparser.h
+++ b/src/plugins/baremetal/sdccparser.h
@@ -25,4 +25,15 @@ private:
     int m_lines = 0;
 };
 
+#ifdef WITH_TESTS
+class SdccParserTest final : public QObject
+{
+   Q_OBJECT
+
+private slots:
+   void testSdccOutputParsers_data();
+   void testSdccOutputParsers();
+};
+#endif // WITH_TESTS
+
 } // BareMetal::Internal