diff --git a/tests/blackcore/blackcoretest.h b/tests/blackcore/blackcoretest.h
index df4820604..d968c066b 100644
--- a/tests/blackcore/blackcoretest.h
+++ b/tests/blackcore/blackcoretest.h
@@ -14,7 +14,8 @@
 
 /*!
  * \namespace BlackCoreTest
- * \internal
+ * \defgroup testblackcore BlackCore Unit Tests
+ * \ingroup tests
  * Unit tests for BlackCore. Unit tests do have their own namespace, so
  * the regular namespace BlackCore is completely free of unit tests.
  * Add any new tests to TestMain::unitMain as shown there.
diff --git a/tests/blackcore/expect.cpp b/tests/blackcore/expect.cpp
index c591aa38a..613c00cbc 100644
--- a/tests/blackcore/expect.cpp
+++ b/tests/blackcore/expect.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "expect.h"
diff --git a/tests/blackcore/expect.h b/tests/blackcore/expect.h
index f574a6350..baab0ba43 100644
--- a/tests/blackcore/expect.h
+++ b/tests/blackcore/expect.h
@@ -21,6 +21,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 namespace BlackCoreTest
diff --git a/tests/blackcore/main.cpp b/tests/blackcore/main.cpp
index 7d10e649f..78c0e7af4 100644
--- a/tests/blackcore/main.cpp
+++ b/tests/blackcore/main.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "testblackcoremain.h"
diff --git a/tests/blackcore/testblackcoremain.cpp b/tests/blackcore/testblackcoremain.cpp
index f9ee1292f..983b3eb6a 100644
--- a/tests/blackcore/testblackcoremain.cpp
+++ b/tests/blackcore/testblackcoremain.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "testblackcoremain.h"
diff --git a/tests/blackcore/testblackcoremain.h b/tests/blackcore/testblackcoremain.h
index 7c5224080..871178ebd 100644
--- a/tests/blackcore/testblackcoremain.h
+++ b/tests/blackcore/testblackcoremain.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "blackmisc/valueobject.h" // for qHash overload, include before Qt stuff due GCC issue
diff --git a/tests/blackcore/testinterpolator.h b/tests/blackcore/testinterpolator.h
index 586bc4833..8eb4c91b8 100644
--- a/tests/blackcore/testinterpolator.h
+++ b/tests/blackcore/testinterpolator.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "blackmisc/aviation/aircraftsituation.h"
diff --git a/tests/blackcore/testnetwork.cpp b/tests/blackcore/testnetwork.cpp
index 1eea65eed..c190d3b2e 100644
--- a/tests/blackcore/testnetwork.cpp
+++ b/tests/blackcore/testnetwork.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "testnetwork.h"
diff --git a/tests/blackcore/testnetwork.h b/tests/blackcore/testnetwork.h
index 314925e07..ef70274c7 100644
--- a/tests/blackcore/testnetwork.h
+++ b/tests/blackcore/testnetwork.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "blackcore/networkvatlib.h"
diff --git a/tests/blackcore/testreaders.cpp b/tests/blackcore/testreaders.cpp
index 7236afbd8..41694c68d 100644
--- a/tests/blackcore/testreaders.cpp
+++ b/tests/blackcore/testreaders.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "testreaders.h"
diff --git a/tests/blackcore/testreaders.h b/tests/blackcore/testreaders.h
index 83cb79c86..939ef9c5f 100644
--- a/tests/blackcore/testreaders.h
+++ b/tests/blackcore/testreaders.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackcore
  */
 
 #include "blackcore/networkvatlib.h"
diff --git a/tests/blackgui/blackguitest.h b/tests/blackgui/blackguitest.h
index 4d49d6623..f0636df45 100644
--- a/tests/blackgui/blackguitest.h
+++ b/tests/blackgui/blackguitest.h
@@ -14,6 +14,8 @@
 
 /*!
  * \namespace BlackGuiTest
+ * \defgroup testblackgui BlackGui Unit Tests
+ * \ingroup tests
  * Unit tests for BlackGui. Unit tests do have their own namespace, so
  * the regular namespace BlackGui is completely free of unit tests.
  * Add any new tests to TestMain::unitMain as shown there.
diff --git a/tests/blackgui/main.cpp b/tests/blackgui/main.cpp
index c272a1f27..db6a6c4a2 100644
--- a/tests/blackgui/main.cpp
+++ b/tests/blackgui/main.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackgui
  */
 
 #include "testblackguimain.h"
diff --git a/tests/blackgui/testblackguimain.cpp b/tests/blackgui/testblackguimain.cpp
index 2d8b6a739..a2ddcacd8 100644
--- a/tests/blackgui/testblackguimain.cpp
+++ b/tests/blackgui/testblackguimain.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackgui
  */
 
 #include "testblackguimain.h"
diff --git a/tests/blackgui/testblackguimain.h b/tests/blackgui/testblackguimain.h
index 15285252a..edc5d5299 100644
--- a/tests/blackgui/testblackguimain.h
+++ b/tests/blackgui/testblackguimain.h
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackgui
  */
 
 #ifndef BLACKCORETEST_TESTMAIN_H
diff --git a/tests/blackgui/testutils.cpp b/tests/blackgui/testutils.cpp
index 1f0a6edac..d1e6ad486 100644
--- a/tests/blackgui/testutils.cpp
+++ b/tests/blackgui/testutils.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackgui
  */
 
 #include "testutils.h"
diff --git a/tests/blackgui/testutils.h b/tests/blackgui/testutils.h
index ae719ab17..6dbfc26ed 100644
--- a/tests/blackgui/testutils.h
+++ b/tests/blackgui/testutils.h
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackgui
  */
 
 #ifndef BLACKCORETEST_TESTUTILS_H
diff --git a/tests/blackmisc/blackmisctest.h b/tests/blackmisc/blackmisctest.h
index 9bbcd5711..162587031 100644
--- a/tests/blackmisc/blackmisctest.h
+++ b/tests/blackmisc/blackmisctest.h
@@ -14,6 +14,8 @@
 
 /*!
  * \namespace BlackMiscTest
+ * \defgroup testblackmisc BlackMisc Unit Tests
+ * \ingroup tests
  * \internal
  * Unit tests for BlackMisc. Unit tests do have their own namespace, so
  * the regular namespace BlackMisc is completely free of unit tests.
diff --git a/tests/blackmisc/main.cpp b/tests/blackmisc/main.cpp
index 47ff587ba..0a0b3c050 100644
--- a/tests/blackmisc/main.cpp
+++ b/tests/blackmisc/main.cpp
@@ -11,7 +11,7 @@
 
 /*!
  * \file
- * \internal
+ * \ingroup testblackmisc
  */
 
 #include "testblackmiscmain.h"
diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp
index 52cc44d5f..44e849344 100644
--- a/tests/blackmisc/testaviation.cpp
+++ b/tests/blackmisc/testaviation.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testaviation.h"
diff --git a/tests/blackmisc/testaviation.h b/tests/blackmisc/testaviation.h
index 20db1b0fb..3281f7e6f 100644
--- a/tests/blackmisc/testaviation.h
+++ b/tests/blackmisc/testaviation.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testblackmiscmain.cpp b/tests/blackmisc/testblackmiscmain.cpp
index 080cae68d..dc5fa9e22 100644
--- a/tests/blackmisc/testblackmiscmain.cpp
+++ b/tests/blackmisc/testblackmiscmain.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testphysicalquantities.h"
diff --git a/tests/blackmisc/testblackmiscmain.h b/tests/blackmisc/testblackmiscmain.h
index 2a021f56c..e536a099c 100644
--- a/tests/blackmisc/testblackmiscmain.h
+++ b/tests/blackmisc/testblackmiscmain.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testcontainers.cpp b/tests/blackmisc/testcontainers.cpp
index f2188fd37..a87818535 100644
--- a/tests/blackmisc/testcontainers.cpp
+++ b/tests/blackmisc/testcontainers.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testcontainers.h"
diff --git a/tests/blackmisc/testcontainers.h b/tests/blackmisc/testcontainers.h
index d40acfbf3..d57881981 100644
--- a/tests/blackmisc/testcontainers.h
+++ b/tests/blackmisc/testcontainers.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testgeo.cpp b/tests/blackmisc/testgeo.cpp
index 5d6b6ea27..952918ab9 100644
--- a/tests/blackmisc/testgeo.cpp
+++ b/tests/blackmisc/testgeo.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testgeo.h"
diff --git a/tests/blackmisc/testgeo.h b/tests/blackmisc/testgeo.h
index 652370ff8..e3946c771 100644
--- a/tests/blackmisc/testgeo.h
+++ b/tests/blackmisc/testgeo.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testidentifier.cpp b/tests/blackmisc/testidentifier.cpp
index 4a1d922cf..652f998b5 100644
--- a/tests/blackmisc/testidentifier.cpp
+++ b/tests/blackmisc/testidentifier.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testidentifier.h"
diff --git a/tests/blackmisc/testidentifier.h b/tests/blackmisc/testidentifier.h
index 753645a6a..ed1d4183b 100644
--- a/tests/blackmisc/testidentifier.h
+++ b/tests/blackmisc/testidentifier.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "blackmisc/identifiable.h"
diff --git a/tests/blackmisc/testinput.cpp b/tests/blackmisc/testinput.cpp
index 110aabb63..ad2265d54 100644
--- a/tests/blackmisc/testinput.cpp
+++ b/tests/blackmisc/testinput.cpp
@@ -10,6 +10,7 @@
 //! \cond PRIVATE_TESTS
 
 /*!
+ * \file
  * \ingroup testblackmisc
  */
 
diff --git a/tests/blackmisc/testinput.h b/tests/blackmisc/testinput.h
index 4e46d922b..c5d81ec00 100644
--- a/tests/blackmisc/testinput.h
+++ b/tests/blackmisc/testinput.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testmath.cpp b/tests/blackmisc/testmath.cpp
index 235d819da..22669ae09 100644
--- a/tests/blackmisc/testmath.cpp
+++ b/tests/blackmisc/testmath.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testmath.h"
diff --git a/tests/blackmisc/testmath.h b/tests/blackmisc/testmath.h
index 8e8949a2f..600bcd055 100644
--- a/tests/blackmisc/testmath.h
+++ b/tests/blackmisc/testmath.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testphysicalquantities.cpp b/tests/blackmisc/testphysicalquantities.cpp
index cbbfd8958..7e83f5f6d 100644
--- a/tests/blackmisc/testphysicalquantities.cpp
+++ b/tests/blackmisc/testphysicalquantities.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testphysicalquantities.h"
diff --git a/tests/blackmisc/testphysicalquantities.h b/tests/blackmisc/testphysicalquantities.h
index 9cfdafca4..228af308b 100644
--- a/tests/blackmisc/testphysicalquantities.h
+++ b/tests/blackmisc/testphysicalquantities.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>
diff --git a/tests/blackmisc/testvaluecache.cpp b/tests/blackmisc/testvaluecache.cpp
index 2dc8995d5..104cfc8c2 100644
--- a/tests/blackmisc/testvaluecache.cpp
+++ b/tests/blackmisc/testvaluecache.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testvaluecache.h"
diff --git a/tests/blackmisc/testvaluecache.h b/tests/blackmisc/testvaluecache.h
index f7ac757a5..1f92e1d47 100644
--- a/tests/blackmisc/testvaluecache.h
+++ b/tests/blackmisc/testvaluecache.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "blackmisc/valuecache.h"
diff --git a/tests/blackmisc/testvalueobject.cpp b/tests/blackmisc/testvalueobject.cpp
index cc6dd23e5..a18d108f0 100644
--- a/tests/blackmisc/testvalueobject.cpp
+++ b/tests/blackmisc/testvalueobject.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testvalueobject.h"
diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h
index 7511166e0..1a8f8cb05 100644
--- a/tests/blackmisc/testvalueobject.h
+++ b/tests/blackmisc/testvalueobject.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "blackmisc/propertyindex.h"
diff --git a/tests/blackmisc/testvariantandmap.cpp b/tests/blackmisc/testvariantandmap.cpp
index 3bf31208d..5841b8636 100644
--- a/tests/blackmisc/testvariantandmap.cpp
+++ b/tests/blackmisc/testvariantandmap.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testvariantandmap.h"
diff --git a/tests/blackmisc/testvariantandmap.h b/tests/blackmisc/testvariantandmap.h
index a597022d1..f38e24792 100644
--- a/tests/blackmisc/testvariantandmap.h
+++ b/tests/blackmisc/testvariantandmap.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "blackmisc/pq/constants.h"
diff --git a/tests/blackmisc/testweather.cpp b/tests/blackmisc/testweather.cpp
index 7e64299ea..7f0e797e8 100644
--- a/tests/blackmisc/testweather.cpp
+++ b/tests/blackmisc/testweather.cpp
@@ -11,6 +11,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include "testweather.h"
diff --git a/tests/blackmisc/testweather.h b/tests/blackmisc/testweather.h
index b7543e572..6989b3984 100644
--- a/tests/blackmisc/testweather.h
+++ b/tests/blackmisc/testweather.h
@@ -14,6 +14,7 @@
 
 /*!
  * \file
+ * \ingroup testblackmisc
  */
 
 #include <QtTest/QtTest>