diff --git a/src/DebugTools/Test/CapsuleRendererTest.cpp b/src/DebugTools/Test/CapsuleRendererTest.cpp
index 0ec537c9c..f674bd02f 100644
--- a/src/DebugTools/Test/CapsuleRendererTest.cpp
+++ b/src/DebugTools/Test/CapsuleRendererTest.cpp
@@ -42,7 +42,7 @@ class CapsuleRendererTest: public TestSuite::Tester {
 };
 
 CapsuleRendererTest::CapsuleRendererTest() {
-    addTests({&CapsuleRendererTest::zeroLength2D,
+    addTests<CapsuleRendererTest>({&CapsuleRendererTest::zeroLength2D,
               &CapsuleRendererTest::common2D,
 
               &CapsuleRendererTest::zeroLength3D,
diff --git a/src/DebugTools/Test/CylinderRendererTest.cpp b/src/DebugTools/Test/CylinderRendererTest.cpp
index 9c18c51fa..c452e9f7a 100644
--- a/src/DebugTools/Test/CylinderRendererTest.cpp
+++ b/src/DebugTools/Test/CylinderRendererTest.cpp
@@ -42,7 +42,7 @@ class CylinderRendererTest: public TestSuite::Tester {
 };
 
 CylinderRendererTest::CylinderRendererTest() {
-    addTests({&CylinderRendererTest::zeroLength2D,
+    addTests<CylinderRendererTest>({&CylinderRendererTest::zeroLength2D,
               &CylinderRendererTest::common2D,
 
               &CylinderRendererTest::zeroLength3D,
diff --git a/src/DebugTools/Test/ForceRendererTest.cpp b/src/DebugTools/Test/ForceRendererTest.cpp
index d560e8e38..314e60ffd 100644
--- a/src/DebugTools/Test/ForceRendererTest.cpp
+++ b/src/DebugTools/Test/ForceRendererTest.cpp
@@ -42,7 +42,7 @@ class ForceRendererTest: public TestSuite::Tester {
 };
 
 ForceRendererTest::ForceRendererTest() {
-    addTests({&ForceRendererTest::zero2D,
+    addTests<ForceRendererTest>({&ForceRendererTest::zero2D,
               &ForceRendererTest::common2D,
 
               &ForceRendererTest::zero3D,
diff --git a/src/DebugTools/Test/LineSegmentRendererTest.cpp b/src/DebugTools/Test/LineSegmentRendererTest.cpp
index c87f992d3..5ad628301 100644
--- a/src/DebugTools/Test/LineSegmentRendererTest.cpp
+++ b/src/DebugTools/Test/LineSegmentRendererTest.cpp
@@ -40,7 +40,7 @@ class LineSegmentRendererTest: public TestSuite::Tester {
 };
 
 LineSegmentRendererTest::LineSegmentRendererTest() {
-    addTests({&LineSegmentRendererTest::line2D,
+    addTests<LineSegmentRendererTest>({&LineSegmentRendererTest::line2D,
               &LineSegmentRendererTest::line3D});
 }
 
diff --git a/src/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Math/Algorithms/Test/GaussJordanTest.cpp
index b20652c18..20260b9f4 100644
--- a/src/Math/Algorithms/Test/GaussJordanTest.cpp
+++ b/src/Math/Algorithms/Test/GaussJordanTest.cpp
@@ -40,7 +40,7 @@ typedef RectangularMatrix<4, 4, Float> Matrix4x4;
 typedef Vector<4, Float> Vector4;
 
 GaussJordanTest::GaussJordanTest() {
-    addTests({&GaussJordanTest::singular,
+    addTests<GaussJordanTest>({&GaussJordanTest::singular,
               &GaussJordanTest::invert});
 }
 
diff --git a/src/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Math/Algorithms/Test/GramSchmidtTest.cpp
index 494615329..4001b1dd9 100644
--- a/src/Math/Algorithms/Test/GramSchmidtTest.cpp
+++ b/src/Math/Algorithms/Test/GramSchmidtTest.cpp
@@ -40,7 +40,7 @@ typedef RectangularMatrix<3, 3, Float> Matrix3x3;
 typedef Vector<3, Float> Vector3;
 
 GramSchmidtTest::GramSchmidtTest() {
-    addTests({&GramSchmidtTest::orthogonalize,
+    addTests<GramSchmidtTest>({&GramSchmidtTest::orthogonalize,
               &GramSchmidtTest::orthonormalize});
 }
 
diff --git a/src/Math/Algorithms/Test/SvdTest.cpp b/src/Math/Algorithms/Test/SvdTest.cpp
index c46448fc4..32dff9049 100644
--- a/src/Math/Algorithms/Test/SvdTest.cpp
+++ b/src/Math/Algorithms/Test/SvdTest.cpp
@@ -71,7 +71,7 @@ constexpr static Matrix5x8f af(
 static const Vector5f expectedf(std::sqrt(1248.0f), 0.0f, 20.0f, std::sqrt(384.0f), 0.0f);
 
 SvdTest::SvdTest() {
-    addTests({&SvdTest::testDouble,
+    addTests<SvdTest>({&SvdTest::testDouble,
               &SvdTest::testFloat});
 }
 
diff --git a/src/Math/Geometry/Test/DistanceTest.cpp b/src/Math/Geometry/Test/DistanceTest.cpp
index f60c94931..ffc1eeb7e 100644
--- a/src/Math/Geometry/Test/DistanceTest.cpp
+++ b/src/Math/Geometry/Test/DistanceTest.cpp
@@ -45,7 +45,7 @@ typedef Math::Vector3<Float> Vector3;
 typedef Math::Constants<Float> Constants;
 
 DistanceTest::DistanceTest() {
-    addTests({&DistanceTest::linePoint2D,
+    addTests<DistanceTest>({&DistanceTest::linePoint2D,
               &DistanceTest::linePoint3D,
               &DistanceTest::lineSegmentPoint2D,
               &DistanceTest::lineSegmentPoint3D});
diff --git a/src/Math/Geometry/Test/IntersectionTest.cpp b/src/Math/Geometry/Test/IntersectionTest.cpp
index db23f96f8..86a84c5fd 100644
--- a/src/Math/Geometry/Test/IntersectionTest.cpp
+++ b/src/Math/Geometry/Test/IntersectionTest.cpp
@@ -41,7 +41,7 @@ typedef Math::Vector2<Float> Vector2;
 typedef Math::Vector3<Float> Vector3;
 
 IntersectionTest::IntersectionTest() {
-    addTests({&IntersectionTest::planeLine,
+    addTests<IntersectionTest>({&IntersectionTest::planeLine,
               &IntersectionTest::lineLine});
 }
 
diff --git a/src/Math/Test/AngleTest.cpp b/src/Math/Test/AngleTest.cpp
index bb64a9803..903207d8a 100644
--- a/src/Math/Test/AngleTest.cpp
+++ b/src/Math/Test/AngleTest.cpp
@@ -49,7 +49,7 @@ typedef Math::Rad<Double> Radd;
 #endif
 
 AngleTest::AngleTest() {
-    addTests({&AngleTest::construct,
+    addTests<AngleTest>({&AngleTest::construct,
               &AngleTest::literals,
               &AngleTest::conversion,
 
diff --git a/src/Math/Test/BoolVectorTest.cpp b/src/Math/Test/BoolVectorTest.cpp
index 06b7a42e3..a4bf186d5 100644
--- a/src/Math/Test/BoolVectorTest.cpp
+++ b/src/Math/Test/BoolVectorTest.cpp
@@ -59,7 +59,7 @@ static_assert(BoolVector<17>::DataSize == 3, "Improper DataSize");
 typedef Math::BoolVector<19> BoolVector19;
 
 BoolVectorTest::BoolVectorTest() {
-    addTests({&BoolVectorTest::construct,
+    addTests<BoolVectorTest>({&BoolVectorTest::construct,
               &BoolVectorTest::constructDefault,
               &BoolVectorTest::constructOneValue,
               &BoolVectorTest::constructOneElement,
diff --git a/src/Math/Test/ComplexTest.cpp b/src/Math/Test/ComplexTest.cpp
index 6f9fd6521..4afc0cf1c 100644
--- a/src/Math/Test/ComplexTest.cpp
+++ b/src/Math/Test/ComplexTest.cpp
@@ -65,7 +65,7 @@ class ComplexTest: public Corrade::TestSuite::Tester {
 };
 
 ComplexTest::ComplexTest() {
-    addTests({&ComplexTest::construct,
+    addTests<ComplexTest>({&ComplexTest::construct,
               &ComplexTest::constructDefault,
               &ComplexTest::constructFromVector,
               &ComplexTest::constructCopy,
diff --git a/src/Math/Test/ConstantsTest.cpp b/src/Math/Test/ConstantsTest.cpp
index 9242453b7..d99d23627 100644
--- a/src/Math/Test/ConstantsTest.cpp
+++ b/src/Math/Test/ConstantsTest.cpp
@@ -38,7 +38,7 @@ class ConstantsTest: public Corrade::TestSuite::Tester {
 };
 
 ConstantsTest::ConstantsTest() {
-    addTests({&ConstantsTest::constantsFloat,
+    addTests<ConstantsTest>({&ConstantsTest::constantsFloat,
               &ConstantsTest::constantsDouble});
 }
 
diff --git a/src/Math/Test/DualComplexTest.cpp b/src/Math/Test/DualComplexTest.cpp
index 6e6c5d554..08b213329 100644
--- a/src/Math/Test/DualComplexTest.cpp
+++ b/src/Math/Test/DualComplexTest.cpp
@@ -71,7 +71,7 @@ typedef Math::Matrix3<Float> Matrix3;
 typedef Math::Vector2<Float> Vector2;
 
 DualComplexTest::DualComplexTest() {
-    addTests({&DualComplexTest::construct,
+    addTests<DualComplexTest>({&DualComplexTest::construct,
               &DualComplexTest::constructDefault,
               &DualComplexTest::constructFromVector,
               &DualComplexTest::constructCopy,
diff --git a/src/Math/Test/DualQuaternionTest.cpp b/src/Math/Test/DualQuaternionTest.cpp
index db7a7e653..caa79560c 100644
--- a/src/Math/Test/DualQuaternionTest.cpp
+++ b/src/Math/Test/DualQuaternionTest.cpp
@@ -69,7 +69,7 @@ typedef Math::Quaternion<Float> Quaternion;
 typedef Math::Vector3<Float> Vector3;
 
 DualQuaternionTest::DualQuaternionTest() {
-    addTests({&DualQuaternionTest::construct,
+    addTests<DualQuaternionTest>({&DualQuaternionTest::construct,
               &DualQuaternionTest::constructDefault,
               &DualQuaternionTest::constructFromVector,
               &DualQuaternionTest::constructCopy,
diff --git a/src/Math/Test/DualTest.cpp b/src/Math/Test/DualTest.cpp
index 1bf0c2da7..e4c364aed 100644
--- a/src/Math/Test/DualTest.cpp
+++ b/src/Math/Test/DualTest.cpp
@@ -52,7 +52,7 @@ class DualTest: public Corrade::TestSuite::Tester {
 typedef Math::Dual<Float> Dual;
 
 DualTest::DualTest() {
-    addTests({&DualTest::construct,
+    addTests<DualTest>({&DualTest::construct,
               &DualTest::constructDefault,
               &DualTest::constructCopy,
 
diff --git a/src/Math/Test/FunctionsTest.cpp b/src/Math/Test/FunctionsTest.cpp
index dc682e664..692d2e609 100644
--- a/src/Math/Test/FunctionsTest.cpp
+++ b/src/Math/Test/FunctionsTest.cpp
@@ -76,7 +76,7 @@ typedef Math::Vector3<Byte> Vector3b;
 typedef Math::Vector3<Int> Vector3i;
 
 FunctionsTest::FunctionsTest() {
-    addTests({&FunctionsTest::min,
+    addTests<FunctionsTest>({&FunctionsTest::min,
               &FunctionsTest::minList,
               &FunctionsTest::max,
               &FunctionsTest::maxList,
diff --git a/src/Math/Test/Matrix3Test.cpp b/src/Math/Test/Matrix3Test.cpp
index 8e07d8cd0..cfcacf334 100644
--- a/src/Math/Test/Matrix3Test.cpp
+++ b/src/Math/Test/Matrix3Test.cpp
@@ -95,7 +95,7 @@ typedef Math::Vector3<Float> Vector3;
 typedef Math::Vector2<Float> Vector2;
 
 Matrix3Test::Matrix3Test() {
-    addTests({&Matrix3Test::construct,
+    addTests<Matrix3Test>({&Matrix3Test::construct,
               &Matrix3Test::constructIdentity,
               &Matrix3Test::constructZero,
               &Matrix3Test::constructConversion,
diff --git a/src/Math/Test/Matrix4Test.cpp b/src/Math/Test/Matrix4Test.cpp
index ec81209b6..ad1262ba9 100644
--- a/src/Math/Test/Matrix4Test.cpp
+++ b/src/Math/Test/Matrix4Test.cpp
@@ -102,7 +102,7 @@ typedef Math::Matrix<3, Float> Matrix3x3;
 typedef Math::Vector3<Float> Vector3;
 
 Matrix4Test::Matrix4Test() {
-    addTests({&Matrix4Test::construct,
+    addTests<Matrix4Test>({&Matrix4Test::construct,
               &Matrix4Test::constructIdentity,
               &Matrix4Test::constructZero,
               &Matrix4Test::constructConversion,
diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp
index 2f9d0c226..2f4c635a0 100644
--- a/src/Math/Test/MatrixTest.cpp
+++ b/src/Math/Test/MatrixTest.cpp
@@ -91,7 +91,7 @@ typedef Vector<3, Float> Vector3;
 typedef Math::Constants<Float> Constants;
 
 MatrixTest::MatrixTest() {
-    addTests({&MatrixTest::construct,
+    addTests<MatrixTest>({&MatrixTest::construct,
               &MatrixTest::constructIdentity,
               &MatrixTest::constructZero,
               &MatrixTest::constructConversion,
diff --git a/src/Math/Test/QuaternionTest.cpp b/src/Math/Test/QuaternionTest.cpp
index 1d4413861..d565be0b7 100644
--- a/src/Math/Test/QuaternionTest.cpp
+++ b/src/Math/Test/QuaternionTest.cpp
@@ -76,7 +76,7 @@ typedef Math::Vector3<Float> Vector3;
 typedef Math::Vector4<Float> Vector4;
 
 QuaternionTest::QuaternionTest() {
-    addTests({&QuaternionTest::construct,
+    addTests<QuaternionTest>({&QuaternionTest::construct,
               &QuaternionTest::constructDefault,
               &QuaternionTest::constructFromVector,
               &QuaternionTest::constructCopy,
diff --git a/src/Math/Test/RangeTest.cpp b/src/Math/Test/RangeTest.cpp
index 341d3f8e2..ae4139aaf 100644
--- a/src/Math/Test/RangeTest.cpp
+++ b/src/Math/Test/RangeTest.cpp
@@ -82,7 +82,7 @@ typedef Vector2<Int> Vector2i;
 typedef Vector3<Int> Vector3i;
 
 RangeTest::RangeTest() {
-    addTests({&RangeTest::construct,
+    addTests<RangeTest>({&RangeTest::construct,
               &RangeTest::constructDefault,
               &RangeTest::constructFromSize,
               &RangeTest::constructConversion,
diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Math/Test/RectangularMatrixTest.cpp
index da6084619..39e39fc24 100644
--- a/src/Math/Test/RectangularMatrixTest.cpp
+++ b/src/Math/Test/RectangularMatrixTest.cpp
@@ -103,7 +103,7 @@ typedef Vector<3, Int> Vector3i;
 typedef Vector<2, Int> Vector2i;
 
 RectangularMatrixTest::RectangularMatrixTest() {
-    addTests({&RectangularMatrixTest::construct,
+    addTests<RectangularMatrixTest>({&RectangularMatrixTest::construct,
               &RectangularMatrixTest::constructDefault,
               &RectangularMatrixTest::constructConversion,
               &RectangularMatrixTest::constructFromData,
diff --git a/src/Math/Test/SwizzleTest.cpp b/src/Math/Test/SwizzleTest.cpp
index 19968ca72..854f674a1 100644
--- a/src/Math/Test/SwizzleTest.cpp
+++ b/src/Math/Test/SwizzleTest.cpp
@@ -41,7 +41,7 @@ class SwizzleTest: public Corrade::TestSuite::Tester {
 typedef Vector<4, Int> Vector4i;
 
 SwizzleTest::SwizzleTest() {
-    addTests({&SwizzleTest::components,
+    addTests<SwizzleTest>({&SwizzleTest::components,
               &SwizzleTest::constants,
               &SwizzleTest::rgba,
               &SwizzleTest::sizes});
diff --git a/src/Math/Test/TypeTraitsTest.cpp b/src/Math/Test/TypeTraitsTest.cpp
index dd5d0edad..169c66950 100644
--- a/src/Math/Test/TypeTraitsTest.cpp
+++ b/src/Math/Test/TypeTraitsTest.cpp
@@ -42,7 +42,7 @@ class TypeTraitsTest: public Corrade::TestSuite::Tester {
 };
 
 TypeTraitsTest::TypeTraitsTest() {
-    addTests({&TypeTraitsTest::equalsIntegral,
+    addTests<TypeTraitsTest>({&TypeTraitsTest::equalsIntegral,
               &TypeTraitsTest::equalsFloatingPoint});
 }
 
diff --git a/src/Math/Test/UnitTest.cpp b/src/Math/Test/UnitTest.cpp
index aa437e7a8..c7dbb4472 100644
--- a/src/Math/Test/UnitTest.cpp
+++ b/src/Math/Test/UnitTest.cpp
@@ -43,7 +43,7 @@ class UnitTest: public Corrade::TestSuite::Tester {
 };
 
 UnitTest::UnitTest() {
-    addTests({&UnitTest::construct,
+    addTests<UnitTest>({&UnitTest::construct,
               &UnitTest::constructDefault,
               &UnitTest::constructConversion,
               &UnitTest::compare,
diff --git a/src/Math/Test/Vector2Test.cpp b/src/Math/Test/Vector2Test.cpp
index 1c766c841..000c1113c 100644
--- a/src/Math/Test/Vector2Test.cpp
+++ b/src/Math/Test/Vector2Test.cpp
@@ -80,7 +80,7 @@ typedef Math::Vector2<Float> Vector2;
 typedef Math::Vector2<Int> Vector2i;
 
 Vector2Test::Vector2Test() {
-    addTests({&Vector2Test::construct,
+    addTests<Vector2Test>({&Vector2Test::construct,
               &Vector2Test::constructDefault,
               &Vector2Test::constructOneValue,
               &Vector2Test::constructConversion,
diff --git a/src/Math/Test/Vector3Test.cpp b/src/Math/Test/Vector3Test.cpp
index fed9e233b..48402ee84 100644
--- a/src/Math/Test/Vector3Test.cpp
+++ b/src/Math/Test/Vector3Test.cpp
@@ -79,7 +79,7 @@ typedef Math::Vector3<Int> Vector3i;
 typedef Math::Vector2<Float> Vector2;
 
 Vector3Test::Vector3Test() {
-    addTests({&Vector3Test::construct,
+    addTests<Vector3Test>({&Vector3Test::construct,
               &Vector3Test::constructDefault,
               &Vector3Test::constructOneValue,
               &Vector3Test::constructParts,
diff --git a/src/Math/Test/Vector4Test.cpp b/src/Math/Test/Vector4Test.cpp
index 1f98566ae..cfba9f712 100644
--- a/src/Math/Test/Vector4Test.cpp
+++ b/src/Math/Test/Vector4Test.cpp
@@ -78,7 +78,7 @@ typedef Math::Vector3<Float> Vector3;
 typedef Math::Vector2<Float> Vector2;
 
 Vector4Test::Vector4Test() {
-    addTests({&Vector4Test::construct,
+    addTests<Vector4Test>({&Vector4Test::construct,
               &Vector4Test::constructDefault,
               &Vector4Test::constructOneValue,
               &Vector4Test::constructParts,
diff --git a/src/Math/Test/VectorTest.cpp b/src/Math/Test/VectorTest.cpp
index 99522fdf7..27b247ba9 100644
--- a/src/Math/Test/VectorTest.cpp
+++ b/src/Math/Test/VectorTest.cpp
@@ -109,7 +109,7 @@ typedef Vector<4, Float> Vector4;
 typedef Vector<4, Int> Vector4i;
 
 VectorTest::VectorTest() {
-    addTests({&VectorTest::construct,
+    addTests<VectorTest>({&VectorTest::construct,
               &VectorTest::constructFromData,
               &VectorTest::constructDefault,
               &VectorTest::constructOneValue,
diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/MeshTools/Test/CombineIndexedArraysTest.cpp
index cf9cd103b..33936b458 100644
--- a/src/MeshTools/Test/CombineIndexedArraysTest.cpp
+++ b/src/MeshTools/Test/CombineIndexedArraysTest.cpp
@@ -40,7 +40,7 @@ class CombineIndexedArraysTest: public TestSuite::Tester {
 };
 
 CombineIndexedArraysTest::CombineIndexedArraysTest() {
-    addTests({&CombineIndexedArraysTest::wrongIndexCount,
+    addTests<CombineIndexedArraysTest>({&CombineIndexedArraysTest::wrongIndexCount,
               &CombineIndexedArraysTest::combine});
 }
 
diff --git a/src/MeshTools/Test/CompressIndicesTest.cpp b/src/MeshTools/Test/CompressIndicesTest.cpp
index 47e4b03cd..3f0bac010 100644
--- a/src/MeshTools/Test/CompressIndicesTest.cpp
+++ b/src/MeshTools/Test/CompressIndicesTest.cpp
@@ -40,7 +40,7 @@ class CompressIndicesTest: public TestSuite::Tester {
 };
 
 CompressIndicesTest::CompressIndicesTest() {
-    addTests({&CompressIndicesTest::compressChar,
+    addTests<CompressIndicesTest>({&CompressIndicesTest::compressChar,
               &CompressIndicesTest::compressShort,
               &CompressIndicesTest::compressInt});
 }
diff --git a/src/MeshTools/Test/DuplicateTest.cpp b/src/MeshTools/Test/DuplicateTest.cpp
index 9fe06065f..2e24969e4 100644
--- a/src/MeshTools/Test/DuplicateTest.cpp
+++ b/src/MeshTools/Test/DuplicateTest.cpp
@@ -37,7 +37,7 @@ class DuplicateTest: public TestSuite::Tester {
 };
 
 DuplicateTest::DuplicateTest() {
-    addTests({&DuplicateTest::duplicate});
+    addTests<DuplicateTest>({&DuplicateTest::duplicate});
 }
 
 void DuplicateTest::duplicate() {
diff --git a/src/MeshTools/Test/FlipNormalsTest.cpp b/src/MeshTools/Test/FlipNormalsTest.cpp
index fb6106f47..9ae53c26f 100644
--- a/src/MeshTools/Test/FlipNormalsTest.cpp
+++ b/src/MeshTools/Test/FlipNormalsTest.cpp
@@ -40,7 +40,7 @@ class FlipNormalsTest: public TestSuite::Tester {
 };
 
 FlipNormalsTest::FlipNormalsTest() {
-    addTests({&FlipNormalsTest::wrongIndexCount,
+    addTests<FlipNormalsTest>({&FlipNormalsTest::wrongIndexCount,
               &FlipNormalsTest::flipFaceWinding,
               &FlipNormalsTest::flipNormals});
 }
diff --git a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/MeshTools/Test/GenerateFlatNormalsTest.cpp
index 32cfca8e1..b681bdaa1 100644
--- a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp
+++ b/src/MeshTools/Test/GenerateFlatNormalsTest.cpp
@@ -39,7 +39,7 @@ class GenerateFlatNormalsTest: public TestSuite::Tester {
 };
 
 GenerateFlatNormalsTest::GenerateFlatNormalsTest() {
-    addTests({&GenerateFlatNormalsTest::wrongIndexCount,
+    addTests<GenerateFlatNormalsTest>({&GenerateFlatNormalsTest::wrongIndexCount,
               &GenerateFlatNormalsTest::generate});
 }
 
diff --git a/src/MeshTools/Test/InterleaveTest.cpp b/src/MeshTools/Test/InterleaveTest.cpp
index 036fe2e8e..6cb9007be 100644
--- a/src/MeshTools/Test/InterleaveTest.cpp
+++ b/src/MeshTools/Test/InterleaveTest.cpp
@@ -44,7 +44,7 @@ class InterleaveTest: public Corrade::TestSuite::Tester {
 };
 
 InterleaveTest::InterleaveTest() {
-    addTests({&InterleaveTest::attributeCount,
+    addTests<InterleaveTest>({&InterleaveTest::attributeCount,
               &InterleaveTest::attributeCountGaps,
               &InterleaveTest::stride,
               &InterleaveTest::strideGaps,
diff --git a/src/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/MeshTools/Test/RemoveDuplicatesTest.cpp
index 2f40c9038..5ac1b5533 100644
--- a/src/MeshTools/Test/RemoveDuplicatesTest.cpp
+++ b/src/MeshTools/Test/RemoveDuplicatesTest.cpp
@@ -38,7 +38,7 @@ class RemoveDuplicatesTest: public TestSuite::Tester {
 typedef Math::Vector<1, int> Vector1;
 
 RemoveDuplicatesTest::RemoveDuplicatesTest() {
-    addTests({&RemoveDuplicatesTest::cleanMesh});
+    addTests<RemoveDuplicatesTest>({&RemoveDuplicatesTest::cleanMesh});
 }
 
 void RemoveDuplicatesTest::cleanMesh() {
diff --git a/src/MeshTools/Test/SubdivideTest.cpp b/src/MeshTools/Test/SubdivideTest.cpp
index 2114b70c6..2b0dd9f83 100644
--- a/src/MeshTools/Test/SubdivideTest.cpp
+++ b/src/MeshTools/Test/SubdivideTest.cpp
@@ -47,7 +47,7 @@ inline Vector1 interpolator(Vector1 a, Vector1 b) { return (a[0]+b[0])/2; }
 }
 
 SubdivideTest::SubdivideTest() {
-    addTests({&SubdivideTest::wrongIndexCount,
+    addTests<SubdivideTest>({&SubdivideTest::wrongIndexCount,
               &SubdivideTest::subdivide});
 }
 
diff --git a/src/MeshTools/Test/TransformTest.cpp b/src/MeshTools/Test/TransformTest.cpp
index 975ffd049..24212e4ae 100644
--- a/src/MeshTools/Test/TransformTest.cpp
+++ b/src/MeshTools/Test/TransformTest.cpp
@@ -43,7 +43,7 @@ class TransformTest: public TestSuite::Tester {
 };
 
 TransformTest::TransformTest() {
-    addTests({&TransformTest::transformVectors2D,
+    addTests<TransformTest>({&TransformTest::transformVectors2D,
               &TransformTest::transformVectors3D,
 
               &TransformTest::transformPoints2D,
diff --git a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
index a63aa1c14..668c2b967 100644
--- a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
+++ b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
@@ -64,7 +64,7 @@ namespace {
 }
 
 TgaImageConverterTest::TgaImageConverterTest() {
-    addTests({&TgaImageConverterTest::wrongFormat,
+    addTests<TgaImageConverterTest>({&TgaImageConverterTest::wrongFormat,
               &TgaImageConverterTest::wrongType,
 
               &TgaImageConverterTest::data});
diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
index 241d71f04..0e3da14ff 100644
--- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
+++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
@@ -55,7 +55,7 @@ class TgaImporterTest: public TestSuite::Tester {
 };
 
 TgaImporterTest::TgaImporterTest() {
-    addTests({&TgaImporterTest::openNonexistent,
+    addTests<TgaImporterTest>({&TgaImporterTest::openNonexistent,
               &TgaImporterTest::openShort,
               &TgaImporterTest::paletted,
               &TgaImporterTest::compressed,
diff --git a/src/Primitives/Test/CapsuleTest.cpp b/src/Primitives/Test/CapsuleTest.cpp
index 23efaba1e..bfeb02f75 100644
--- a/src/Primitives/Test/CapsuleTest.cpp
+++ b/src/Primitives/Test/CapsuleTest.cpp
@@ -47,7 +47,7 @@ class CapsuleTest: public TestSuite::Tester {
 };
 
 CapsuleTest::CapsuleTest() {
-    addTests({&CapsuleTest::wireframe2D,
+    addTests<CapsuleTest>({&CapsuleTest::wireframe2D,
               &CapsuleTest::solid3DWithoutTextureCoords,
               &CapsuleTest::solid3DWithTextureCoords,
               &CapsuleTest::wireframe3D});
diff --git a/src/Primitives/Test/CircleTest.cpp b/src/Primitives/Test/CircleTest.cpp
index 4395086f3..0817261d9 100644
--- a/src/Primitives/Test/CircleTest.cpp
+++ b/src/Primitives/Test/CircleTest.cpp
@@ -39,7 +39,7 @@ class CircleTest: public TestSuite::Tester {
 };
 
 CircleTest::CircleTest() {
-    addTests({&CircleTest::solid,
+    addTests<CircleTest>({&CircleTest::solid,
               &CircleTest::wireframe});
 }
 
diff --git a/src/Primitives/Test/CylinderTest.cpp b/src/Primitives/Test/CylinderTest.cpp
index 10bc34add..545ec3780 100644
--- a/src/Primitives/Test/CylinderTest.cpp
+++ b/src/Primitives/Test/CylinderTest.cpp
@@ -41,7 +41,7 @@ class CylinderTest: public TestSuite::Tester {
 };
 
 CylinderTest::CylinderTest() {
-    addTests({&CylinderTest::solidWithoutAnything,
+    addTests<CylinderTest>({&CylinderTest::solidWithoutAnything,
               &CylinderTest::solidWithTextureCoordsAndCaps,
               &CylinderTest::wireframe});
 }
diff --git a/src/Primitives/Test/IcosphereTest.cpp b/src/Primitives/Test/IcosphereTest.cpp
index e6f6d13db..e3cbd9ca9 100644
--- a/src/Primitives/Test/IcosphereTest.cpp
+++ b/src/Primitives/Test/IcosphereTest.cpp
@@ -38,7 +38,7 @@ class IcosphereTest: public TestSuite::Tester {
 };
 
 IcosphereTest::IcosphereTest() {
-    addTests({&IcosphereTest::count});
+    addTests<IcosphereTest>({&IcosphereTest::count});
 }
 
 void IcosphereTest::count() {
diff --git a/src/Primitives/Test/UVSphereTest.cpp b/src/Primitives/Test/UVSphereTest.cpp
index f4df1a54e..831d1bfef 100644
--- a/src/Primitives/Test/UVSphereTest.cpp
+++ b/src/Primitives/Test/UVSphereTest.cpp
@@ -41,7 +41,7 @@ class UVSphereTest: public TestSuite::Tester {
 };
 
 UVSphereTest::UVSphereTest() {
-    addTests({&UVSphereTest::solidWithoutTextureCoords,
+    addTests<UVSphereTest>({&UVSphereTest::solidWithoutTextureCoords,
               &UVSphereTest::solidWithTextureCoords,
               &UVSphereTest::wireframe});
 }
diff --git a/src/SceneGraph/Test/AnimableTest.cpp b/src/SceneGraph/Test/AnimableTest.cpp
index eb9c9eb7d..55b9eb761 100644
--- a/src/SceneGraph/Test/AnimableTest.cpp
+++ b/src/SceneGraph/Test/AnimableTest.cpp
@@ -48,7 +48,7 @@ class AnimableTest: public TestSuite::Tester {
 typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;
 
 AnimableTest::AnimableTest() {
-    addTests({&AnimableTest::state,
+    addTests<AnimableTest>({&AnimableTest::state,
               &AnimableTest::step,
               &AnimableTest::duration,
               &AnimableTest::repeat,
diff --git a/src/SceneGraph/Test/CameraTest.cpp b/src/SceneGraph/Test/CameraTest.cpp
index 14ed3c555..6c816d62c 100644
--- a/src/SceneGraph/Test/CameraTest.cpp
+++ b/src/SceneGraph/Test/CameraTest.cpp
@@ -53,7 +53,7 @@ typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;
 typedef SceneGraph::Scene<SceneGraph::MatrixTransformation3D> Scene3D;
 
 CameraTest::CameraTest() {
-    addTests({&CameraTest::fixAspectRatio,
+    addTests<CameraTest>({&CameraTest::fixAspectRatio,
               &CameraTest::defaultProjection2D,
               &CameraTest::defaultProjection3D,
               &CameraTest::projectionSize2D,
diff --git a/src/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/SceneGraph/Test/DualComplexTransformationTest.cpp
index 5d7417065..0b4f18088 100644
--- a/src/SceneGraph/Test/DualComplexTransformationTest.cpp
+++ b/src/SceneGraph/Test/DualComplexTransformationTest.cpp
@@ -51,7 +51,7 @@ class DualComplexTransformationTest: public TestSuite::Tester {
 };
 
 DualComplexTransformationTest::DualComplexTransformationTest() {
-    addTests({&DualComplexTransformationTest::fromMatrix,
+    addTests<DualComplexTransformationTest>({&DualComplexTransformationTest::fromMatrix,
               &DualComplexTransformationTest::toMatrix,
               &DualComplexTransformationTest::compose,
               &DualComplexTransformationTest::inverted,
diff --git a/src/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/SceneGraph/Test/DualQuaternionTransformationTest.cpp
index 72d5d0f41..1e0d0535e 100644
--- a/src/SceneGraph/Test/DualQuaternionTransformationTest.cpp
+++ b/src/SceneGraph/Test/DualQuaternionTransformationTest.cpp
@@ -51,7 +51,7 @@ class DualQuaternionTransformationTest: public TestSuite::Tester {
 };
 
 DualQuaternionTransformationTest::DualQuaternionTransformationTest() {
-    addTests({&DualQuaternionTransformationTest::fromMatrix,
+    addTests<DualQuaternionTransformationTest>({&DualQuaternionTransformationTest::fromMatrix,
               &DualQuaternionTransformationTest::toMatrix,
               &DualQuaternionTransformationTest::compose,
               &DualQuaternionTransformationTest::inverted,
diff --git a/src/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/SceneGraph/Test/MatrixTransformation2DTest.cpp
index b1408956e..3ef781249 100644
--- a/src/SceneGraph/Test/MatrixTransformation2DTest.cpp
+++ b/src/SceneGraph/Test/MatrixTransformation2DTest.cpp
@@ -51,7 +51,7 @@ class MatrixTransformation2DTest: public TestSuite::Tester {
 };
 
 MatrixTransformation2DTest::MatrixTransformation2DTest() {
-    addTests({&MatrixTransformation2DTest::fromMatrix,
+    addTests<MatrixTransformation2DTest>({&MatrixTransformation2DTest::fromMatrix,
               &MatrixTransformation2DTest::toMatrix,
               &MatrixTransformation2DTest::compose,
               &MatrixTransformation2DTest::inverted,
diff --git a/src/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/SceneGraph/Test/MatrixTransformation3DTest.cpp
index 66240a318..0a250d44c 100644
--- a/src/SceneGraph/Test/MatrixTransformation3DTest.cpp
+++ b/src/SceneGraph/Test/MatrixTransformation3DTest.cpp
@@ -51,7 +51,7 @@ class MatrixTransformation3DTest: public TestSuite::Tester {
 };
 
 MatrixTransformation3DTest::MatrixTransformation3DTest() {
-    addTests({&MatrixTransformation3DTest::fromMatrix,
+    addTests<MatrixTransformation3DTest>({&MatrixTransformation3DTest::fromMatrix,
               &MatrixTransformation3DTest::toMatrix,
               &MatrixTransformation3DTest::compose,
               &MatrixTransformation3DTest::inverted,
diff --git a/src/SceneGraph/Test/ObjectTest.cpp b/src/SceneGraph/Test/ObjectTest.cpp
index 0dbbefe7a..2b4fea880 100644
--- a/src/SceneGraph/Test/ObjectTest.cpp
+++ b/src/SceneGraph/Test/ObjectTest.cpp
@@ -65,7 +65,7 @@ class CachingObject: public Object3D, AbstractFeature3D {
 };
 
 ObjectTest::ObjectTest() {
-    addTests({&ObjectTest::parenting,
+    addTests<ObjectTest>({&ObjectTest::parenting,
               &ObjectTest::scene,
               &ObjectTest::setParentKeepTransformation,
               &ObjectTest::absoluteTransformation,
diff --git a/src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
index f33537c2f..c16831f35 100644
--- a/src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
+++ b/src/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
@@ -52,7 +52,7 @@ class RigidMatrixTransformation2DTest: public TestSuite::Tester {
 };
 
 RigidMatrixTransformation2DTest::RigidMatrixTransformation2DTest() {
-    addTests({&RigidMatrixTransformation2DTest::fromMatrix,
+    addTests<RigidMatrixTransformation2DTest>({&RigidMatrixTransformation2DTest::fromMatrix,
               &RigidMatrixTransformation2DTest::toMatrix,
               &RigidMatrixTransformation2DTest::compose,
               &RigidMatrixTransformation2DTest::inverted,
diff --git a/src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
index d6cf466a7..89a0df1ad 100644
--- a/src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
+++ b/src/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
@@ -52,7 +52,7 @@ class RigidMatrixTransformation3DTest: public TestSuite::Tester {
 };
 
 RigidMatrixTransformation3DTest::RigidMatrixTransformation3DTest() {
-    addTests({&RigidMatrixTransformation3DTest::fromMatrix,
+    addTests<RigidMatrixTransformation3DTest>({&RigidMatrixTransformation3DTest::fromMatrix,
               &RigidMatrixTransformation3DTest::toMatrix,
               &RigidMatrixTransformation3DTest::compose,
               &RigidMatrixTransformation3DTest::inverted,
diff --git a/src/SceneGraph/Test/SceneTest.cpp b/src/SceneGraph/Test/SceneTest.cpp
index 65f8dcb60..e242df54a 100644
--- a/src/SceneGraph/Test/SceneTest.cpp
+++ b/src/SceneGraph/Test/SceneTest.cpp
@@ -41,7 +41,7 @@ typedef SceneGraph::Scene<SceneGraph::MatrixTransformation3D> Scene3D;
 typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;
 
 SceneTest::SceneTest() {
-    addTests({&SceneTest::transformation,
+    addTests<SceneTest>({&SceneTest::transformation,
               &SceneTest::parent});
 }
 
diff --git a/src/SceneGraph/Test/TranslationTransformationTest.cpp b/src/SceneGraph/Test/TranslationTransformationTest.cpp
index 801fd4b1e..b3d69bdaa 100644
--- a/src/SceneGraph/Test/TranslationTransformationTest.cpp
+++ b/src/SceneGraph/Test/TranslationTransformationTest.cpp
@@ -51,7 +51,7 @@ class TranslationTransformationTest: public TestSuite::Tester {
 };
 
 TranslationTransformationTest::TranslationTransformationTest() {
-    addTests({&TranslationTransformationTest::fromMatrix,
+    addTests<TranslationTransformationTest>({&TranslationTransformationTest::fromMatrix,
               &TranslationTransformationTest::toMatrix,
               &TranslationTransformationTest::compose,
               &TranslationTransformationTest::inverted,
diff --git a/src/Shapes/Test/AxisAlignedBoxTest.cpp b/src/Shapes/Test/AxisAlignedBoxTest.cpp
index 8f4a940c5..2f91bf277 100644
--- a/src/Shapes/Test/AxisAlignedBoxTest.cpp
+++ b/src/Shapes/Test/AxisAlignedBoxTest.cpp
@@ -40,7 +40,7 @@ class AxisAlignedBoxTest: public TestSuite::Tester {
 };
 
 AxisAlignedBoxTest::AxisAlignedBoxTest() {
-    addTests({&AxisAlignedBoxTest::transformed,
+    addTests<AxisAlignedBoxTest>({&AxisAlignedBoxTest::transformed,
               &AxisAlignedBoxTest::collisionPoint});
 }
 
diff --git a/src/Shapes/Test/BoxTest.cpp b/src/Shapes/Test/BoxTest.cpp
index 1be8e1c71..6867bc7e7 100644
--- a/src/Shapes/Test/BoxTest.cpp
+++ b/src/Shapes/Test/BoxTest.cpp
@@ -38,7 +38,7 @@ class BoxTest: public TestSuite::Tester {
 };
 
 BoxTest::BoxTest() {
-    addTests({&BoxTest::transformed});
+    addTests<BoxTest>({&BoxTest::transformed});
 }
 
 void BoxTest::transformed() {
diff --git a/src/Shapes/Test/CapsuleTest.cpp b/src/Shapes/Test/CapsuleTest.cpp
index ebbb78241..4e2d70386 100644
--- a/src/Shapes/Test/CapsuleTest.cpp
+++ b/src/Shapes/Test/CapsuleTest.cpp
@@ -44,7 +44,7 @@ class CapsuleTest: public TestSuite::Tester {
 };
 
 CapsuleTest::CapsuleTest() {
-    addTests({&CapsuleTest::transformed,
+    addTests<CapsuleTest>({&CapsuleTest::transformed,
               &CapsuleTest::collisionPoint,
               &CapsuleTest::collisionSphere});
 }
diff --git a/src/Shapes/Test/CollisionTest.cpp b/src/Shapes/Test/CollisionTest.cpp
index 545d13f35..51719be46 100644
--- a/src/Shapes/Test/CollisionTest.cpp
+++ b/src/Shapes/Test/CollisionTest.cpp
@@ -38,7 +38,7 @@ class CollisionTest: public TestSuite::Tester {
 };
 
 CollisionTest::CollisionTest() {
-    addTests({&CollisionTest::boolConversion,
+    addTests<CollisionTest>({&CollisionTest::boolConversion,
               &CollisionTest::flipped});
 }
 
diff --git a/src/Shapes/Test/CompositionTest.cpp b/src/Shapes/Test/CompositionTest.cpp
index da9a4d08e..f639f774e 100644
--- a/src/Shapes/Test/CompositionTest.cpp
+++ b/src/Shapes/Test/CompositionTest.cpp
@@ -52,7 +52,7 @@ class CompositionTest: public TestSuite::Tester {
 };
 
 CompositionTest::CompositionTest() {
-    addTests({&CompositionTest::negated,
+    addTests<CompositionTest>({&CompositionTest::negated,
               &CompositionTest::anded,
               &CompositionTest::ored,
               &CompositionTest::multipleUnary,
diff --git a/src/Shapes/Test/CylinderTest.cpp b/src/Shapes/Test/CylinderTest.cpp
index 013f16da9..acfe209a8 100644
--- a/src/Shapes/Test/CylinderTest.cpp
+++ b/src/Shapes/Test/CylinderTest.cpp
@@ -44,7 +44,7 @@ class CylinderTest: public TestSuite::Tester {
 };
 
 CylinderTest::CylinderTest() {
-    addTests({&CylinderTest::transformed,
+    addTests<CylinderTest>({&CylinderTest::transformed,
               &CylinderTest::collisionPoint,
               &CylinderTest::collisionSphere});
 }
diff --git a/src/Shapes/Test/LineTest.cpp b/src/Shapes/Test/LineTest.cpp
index bb8ce701d..0c9c661cc 100644
--- a/src/Shapes/Test/LineTest.cpp
+++ b/src/Shapes/Test/LineTest.cpp
@@ -38,7 +38,7 @@ class LineTest: public TestSuite::Tester {
 };
 
 LineTest::LineTest() {
-    addTests({&LineTest::transformed});
+    addTests<LineTest>({&LineTest::transformed});
 }
 
 void LineTest::transformed() {
diff --git a/src/Shapes/Test/PlaneTest.cpp b/src/Shapes/Test/PlaneTest.cpp
index 5041aeb85..36f648675 100644
--- a/src/Shapes/Test/PlaneTest.cpp
+++ b/src/Shapes/Test/PlaneTest.cpp
@@ -41,7 +41,7 @@ class PlaneTest: public TestSuite::Tester {
 };
 
 PlaneTest::PlaneTest() {
-    addTests({&PlaneTest::transformed,
+    addTests<PlaneTest>({&PlaneTest::transformed,
               &PlaneTest::collisionLine,
               &PlaneTest::collisionLineSegment});
 }
diff --git a/src/Shapes/Test/PointTest.cpp b/src/Shapes/Test/PointTest.cpp
index 38d344edc..1e21bebc6 100644
--- a/src/Shapes/Test/PointTest.cpp
+++ b/src/Shapes/Test/PointTest.cpp
@@ -38,7 +38,7 @@ class PointTest: public TestSuite::Tester {
 };
 
 PointTest::PointTest() {
-    addTests({&PointTest::transformed});
+    addTests<PointTest>({&PointTest::transformed});
 }
 
 void PointTest::transformed() {
diff --git a/src/Shapes/Test/ShapeImplementationTest.cpp b/src/Shapes/Test/ShapeImplementationTest.cpp
index eced1884a..17ffb2518 100644
--- a/src/Shapes/Test/ShapeImplementationTest.cpp
+++ b/src/Shapes/Test/ShapeImplementationTest.cpp
@@ -37,7 +37,7 @@ class ShapeImplementationTest: public TestSuite::Tester {
 };
 
 ShapeImplementationTest::ShapeImplementationTest() {
-    addTests({&ShapeImplementationTest::debug});
+    addTests<ShapeImplementationTest>({&ShapeImplementationTest::debug});
 }
 
 void ShapeImplementationTest::debug() {
diff --git a/src/Shapes/Test/ShapeTest.cpp b/src/Shapes/Test/ShapeTest.cpp
index 432c55a9d..e1ff5737c 100644
--- a/src/Shapes/Test/ShapeTest.cpp
+++ b/src/Shapes/Test/ShapeTest.cpp
@@ -50,7 +50,7 @@ typedef SceneGraph::Scene<SceneGraph::MatrixTransformation3D> Scene3D;
 typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;
 
 ShapeTest::ShapeTest() {
-    addTests({&ShapeTest::clean,
+    addTests<ShapeTest>({&ShapeTest::clean,
               &ShapeTest::firstCollision,
               &ShapeTest::shapeGroup});
 }
diff --git a/src/Shapes/Test/SphereTest.cpp b/src/Shapes/Test/SphereTest.cpp
index 5a32c4721..991e88a7a 100644
--- a/src/Shapes/Test/SphereTest.cpp
+++ b/src/Shapes/Test/SphereTest.cpp
@@ -47,7 +47,7 @@ class SphereTest: public TestSuite::Tester {
 };
 
 SphereTest::SphereTest() {
-    addTests({&SphereTest::transformed,
+    addTests<SphereTest>({&SphereTest::transformed,
               &SphereTest::collisionPoint,
               &SphereTest::collisionPointInverted,
               &SphereTest::collisionLine,
diff --git a/src/Test/AbstractImageTest.cpp b/src/Test/AbstractImageTest.cpp
index 2b4e23916..a5a87373a 100644
--- a/src/Test/AbstractImageTest.cpp
+++ b/src/Test/AbstractImageTest.cpp
@@ -39,7 +39,7 @@ class AbstractImageTest: public TestSuite::Tester {
 };
 
 AbstractImageTest::AbstractImageTest() {
-    addTests({&AbstractImageTest::debugFormat,
+    addTests<AbstractImageTest>({&AbstractImageTest::debugFormat,
               &AbstractImageTest::debugType});
 }
 
diff --git a/src/Test/AbstractShaderProgramTest.cpp b/src/Test/AbstractShaderProgramTest.cpp
index b3c4c3c30..6ca72d2dc 100644
--- a/src/Test/AbstractShaderProgramTest.cpp
+++ b/src/Test/AbstractShaderProgramTest.cpp
@@ -49,7 +49,7 @@ class AbstractShaderProgramTest: public TestSuite::Tester {
 };
 
 AbstractShaderProgramTest::AbstractShaderProgramTest() {
-    addTests({&AbstractShaderProgramTest::attributeScalar,
+    addTests<AbstractShaderProgramTest>({&AbstractShaderProgramTest::attributeScalar,
               &AbstractShaderProgramTest::attributeScalarInt,
               &AbstractShaderProgramTest::attributeScalarUnsignedInt,
               &AbstractShaderProgramTest::attributeScalarDouble,
diff --git a/src/Test/ArrayTest.cpp b/src/Test/ArrayTest.cpp
index 67ac18667..0b9d51536 100644
--- a/src/Test/ArrayTest.cpp
+++ b/src/Test/ArrayTest.cpp
@@ -42,7 +42,7 @@ typedef Magnum::Array2D<Int> Array2D;
 typedef Magnum::Array3D<Int> Array3D;
 
 ArrayTest::ArrayTest() {
-    addTests({&ArrayTest::construct,
+    addTests<ArrayTest>({&ArrayTest::construct,
               &ArrayTest::equality,
               &ArrayTest::access});
 }
diff --git a/src/Test/ColorTest.cpp b/src/Test/ColorTest.cpp
index f6149b26d..6d31d526f 100644
--- a/src/Test/ColorTest.cpp
+++ b/src/Test/ColorTest.cpp
@@ -65,7 +65,7 @@ typedef BasicColor3<UnsignedByte> Color3ub;
 typedef BasicColor4<UnsignedByte> Color4ub;
 
 ColorTest::ColorTest() {
-    addTests({&ColorTest::construct,
+    addTests<ColorTest>({&ColorTest::construct,
               &ColorTest::constructDefault,
               &ColorTest::constructOneValue,
               &ColorTest::constructParts,
diff --git a/src/Test/DefaultFramebufferTest.cpp b/src/Test/DefaultFramebufferTest.cpp
index a0dceffbd..a3862d6fa 100644
--- a/src/Test/DefaultFramebufferTest.cpp
+++ b/src/Test/DefaultFramebufferTest.cpp
@@ -37,7 +37,7 @@ class DefaultFramebufferTest: public TestSuite::Tester {
 };
 
 DefaultFramebufferTest::DefaultFramebufferTest() {
-    addTests({&DefaultFramebufferTest::debugStatus});
+    addTests<DefaultFramebufferTest>({&DefaultFramebufferTest::debugStatus});
 }
 
 void DefaultFramebufferTest::debugStatus() {
diff --git a/src/Test/FramebufferTest.cpp b/src/Test/FramebufferTest.cpp
index a3b43be21..b902e1cbd 100644
--- a/src/Test/FramebufferTest.cpp
+++ b/src/Test/FramebufferTest.cpp
@@ -37,7 +37,7 @@ class FramebufferTest: public TestSuite::Tester {
 };
 
 FramebufferTest::FramebufferTest() {
-    addTests({&FramebufferTest::debugStatus});
+    addTests<FramebufferTest>({&FramebufferTest::debugStatus});
 }
 
 void FramebufferTest::debugStatus() {
diff --git a/src/Test/ImageTest.cpp b/src/Test/ImageTest.cpp
index 6948f9c8d..317c868f6 100644
--- a/src/Test/ImageTest.cpp
+++ b/src/Test/ImageTest.cpp
@@ -39,7 +39,7 @@ class ImageTest: public TestSuite::Tester {
 };
 
 ImageTest::ImageTest() {
-    addTests({&ImageTest::moveConstructor,
+    addTests<ImageTest>({&ImageTest::moveConstructor,
               &ImageTest::moveAssignment,
               &ImageTest::toReference});
 }
diff --git a/src/Test/MeshTest.cpp b/src/Test/MeshTest.cpp
index 7b382c3e4..839e6610b 100644
--- a/src/Test/MeshTest.cpp
+++ b/src/Test/MeshTest.cpp
@@ -41,7 +41,7 @@ class MeshTest: public TestSuite::Tester {
 };
 
 MeshTest::MeshTest() {
-    addTests({&MeshTest::debugPrimitive,
+    addTests<MeshTest>({&MeshTest::debugPrimitive,
               &MeshTest::debugIndexType,
               &MeshTest::configurationPrimitive,
               &MeshTest::configurationIndexType});
diff --git a/src/Test/RendererTest.cpp b/src/Test/RendererTest.cpp
index 7e784dc11..1a17e6cbf 100644
--- a/src/Test/RendererTest.cpp
+++ b/src/Test/RendererTest.cpp
@@ -39,7 +39,7 @@ class RendererTest: public TestSuite::Tester {
 };
 
 RendererTest::RendererTest() {
-    addTests({&RendererTest::debugError});
+    addTests<RendererTest>({&RendererTest::debugError});
 }
 
 void RendererTest::debugError() {
diff --git a/src/Test/ResourceManagerTest.cpp b/src/Test/ResourceManagerTest.cpp
index 7718c1906..e9bc0e8b0 100644
--- a/src/Test/ResourceManagerTest.cpp
+++ b/src/Test/ResourceManagerTest.cpp
@@ -61,7 +61,7 @@ typedef Magnum::ResourceManager<Int, Data> ResourceManager;
 size_t Data::count = 0;
 
 ResourceManagerTest::ResourceManagerTest() {
-    addTests({&ResourceManagerTest::state,
+    addTests<ResourceManagerTest>({&ResourceManagerTest::state,
               &ResourceManagerTest::stateFallback,
               &ResourceManagerTest::stateDisallowed,
               &ResourceManagerTest::basic,
diff --git a/src/Test/SamplerTest.cpp b/src/Test/SamplerTest.cpp
index 961b16f1c..a4bb1b8df 100644
--- a/src/Test/SamplerTest.cpp
+++ b/src/Test/SamplerTest.cpp
@@ -39,7 +39,7 @@ class SamplerTest: public TestSuite::Tester {
 };
 
 SamplerTest::SamplerTest() {
-    addTests({&SamplerTest::debugFilter,
+    addTests<SamplerTest>({&SamplerTest::debugFilter,
               &SamplerTest::debugMipmap,
               &SamplerTest::debugWrapping});
 }
diff --git a/src/Text/Test/AbstractFontConverterTest.cpp b/src/Text/Test/AbstractFontConverterTest.cpp
index b3bc79f78..b3356d192 100644
--- a/src/Text/Test/AbstractFontConverterTest.cpp
+++ b/src/Text/Test/AbstractFontConverterTest.cpp
@@ -51,7 +51,7 @@ class AbstractFontConverterTest: public TestSuite::Tester {
 };
 
 AbstractFontConverterTest::AbstractFontConverterTest() {
-    addTests({&AbstractFontConverterTest::convertGlyphs,
+    addTests<AbstractFontConverterTest>({&AbstractFontConverterTest::convertGlyphs,
 
               &AbstractFontConverterTest::exportFontToSingleData,
               &AbstractFontConverterTest::exportFontToFile,
diff --git a/src/Text/Test/AbstractFontTest.cpp b/src/Text/Test/AbstractFontTest.cpp
index 30c6ff198..53811e399 100644
--- a/src/Text/Test/AbstractFontTest.cpp
+++ b/src/Text/Test/AbstractFontTest.cpp
@@ -41,7 +41,7 @@ class AbstractFontTest: public TestSuite::Tester {
 };
 
 AbstractFontTest::AbstractFontTest() {
-    addTests({&AbstractFontTest::openSingleData,
+    addTests<AbstractFontTest>({&AbstractFontTest::openSingleData,
               &AbstractFontTest::openFile});
 }
 
diff --git a/src/Text/Test/AbstractLayouterTest.cpp b/src/Text/Test/AbstractLayouterTest.cpp
index 18d5feb8e..2dc0d714c 100644
--- a/src/Text/Test/AbstractLayouterTest.cpp
+++ b/src/Text/Test/AbstractLayouterTest.cpp
@@ -37,7 +37,7 @@ class AbstractLayouterTest: public TestSuite::Tester {
 };
 
 AbstractLayouterTest::AbstractLayouterTest() {
-    addTests({&AbstractLayouterTest::renderGlyph});
+    addTests<AbstractLayouterTest>({&AbstractLayouterTest::renderGlyph});
 }
 
 void AbstractLayouterTest::renderGlyph() {
diff --git a/src/TextureTools/Test/AtlasTest.cpp b/src/TextureTools/Test/AtlasTest.cpp
index 6181c2cfe..64de1e245 100644
--- a/src/TextureTools/Test/AtlasTest.cpp
+++ b/src/TextureTools/Test/AtlasTest.cpp
@@ -41,7 +41,7 @@ class AtlasTest: public TestSuite::Tester {
 };
 
 AtlasTest::AtlasTest() {
-    addTests({&AtlasTest::create,
+    addTests<AtlasTest>({&AtlasTest::create,
               &AtlasTest::createPadding,
               &AtlasTest::createEmpty,
               &AtlasTest::createTooSmall});
diff --git a/src/Trade/Test/AbstractImageConverterTest.cpp b/src/Trade/Test/AbstractImageConverterTest.cpp
index fa0c5616b..2a4f53776 100644
--- a/src/Trade/Test/AbstractImageConverterTest.cpp
+++ b/src/Trade/Test/AbstractImageConverterTest.cpp
@@ -43,7 +43,7 @@ class AbstractImageConverterTest: public TestSuite::Tester {
 };
 
 AbstractImageConverterTest::AbstractImageConverterTest() {
-    addTests({&AbstractImageConverterTest::exportToFile});
+    addTests<AbstractImageConverterTest>({&AbstractImageConverterTest::exportToFile});
 }
 
 void AbstractImageConverterTest::exportToFile() {
diff --git a/src/Trade/Test/AbstractImporterTest.cpp b/src/Trade/Test/AbstractImporterTest.cpp
index 3dacf06dd..140b4011a 100644
--- a/src/Trade/Test/AbstractImporterTest.cpp
+++ b/src/Trade/Test/AbstractImporterTest.cpp
@@ -40,7 +40,7 @@ class AbstractImporterTest: public TestSuite::Tester {
 };
 
 AbstractImporterTest::AbstractImporterTest() {
-    addTests({&AbstractImporterTest::openFile});
+    addTests<AbstractImporterTest>({&AbstractImporterTest::openFile});
 }
 
 void AbstractImporterTest::openFile() {
diff --git a/src/Trade/Test/AbstractMaterialDataTest.cpp b/src/Trade/Test/AbstractMaterialDataTest.cpp
index a85f6308f..c85efb8cc 100644
--- a/src/Trade/Test/AbstractMaterialDataTest.cpp
+++ b/src/Trade/Test/AbstractMaterialDataTest.cpp
@@ -37,7 +37,7 @@ class AbstractMaterialDataTest: public TestSuite::Tester {
 };
 
 AbstractMaterialDataTest::AbstractMaterialDataTest() {
-    addTests({&AbstractMaterialDataTest::debug});
+    addTests<AbstractMaterialDataTest>({&AbstractMaterialDataTest::debug});
 }
 
 void AbstractMaterialDataTest::debug() {
diff --git a/src/Trade/Test/ImageDataTest.cpp b/src/Trade/Test/ImageDataTest.cpp
index bf1b9bb41..852e20268 100644
--- a/src/Trade/Test/ImageDataTest.cpp
+++ b/src/Trade/Test/ImageDataTest.cpp
@@ -39,7 +39,7 @@ class ImageDataTest: public TestSuite::Tester {
 };
 
 ImageDataTest::ImageDataTest() {
-    addTests({&ImageDataTest::moveConstructor,
+    addTests<ImageDataTest>({&ImageDataTest::moveConstructor,
               &ImageDataTest::moveAssignment,
               &ImageDataTest::toReference});
 }
diff --git a/src/Trade/Test/ObjectData2DTest.cpp b/src/Trade/Test/ObjectData2DTest.cpp
index 4806c02fa..a41001b63 100644
--- a/src/Trade/Test/ObjectData2DTest.cpp
+++ b/src/Trade/Test/ObjectData2DTest.cpp
@@ -37,7 +37,7 @@ class ObjectData2DTest: public TestSuite::Tester {
 };
 
 ObjectData2DTest::ObjectData2DTest() {
-    addTests({&ObjectData2DTest::debug});
+    addTests<ObjectData2DTest>({&ObjectData2DTest::debug});
 }
 
 void ObjectData2DTest::debug() {
diff --git a/src/Trade/Test/ObjectData3DTest.cpp b/src/Trade/Test/ObjectData3DTest.cpp
index ec08578ae..285a7a1ad 100644
--- a/src/Trade/Test/ObjectData3DTest.cpp
+++ b/src/Trade/Test/ObjectData3DTest.cpp
@@ -37,7 +37,7 @@ class ObjectData3DTest: public TestSuite::Tester {
 };
 
 ObjectData3DTest::ObjectData3DTest() {
-    addTests({&ObjectData3DTest::debug});
+    addTests<ObjectData3DTest>({&ObjectData3DTest::debug});
 }
 
 void ObjectData3DTest::debug() {
diff --git a/src/Trade/Test/TextureDataTest.cpp b/src/Trade/Test/TextureDataTest.cpp
index 3fb83bd70..d0946907a 100644
--- a/src/Trade/Test/TextureDataTest.cpp
+++ b/src/Trade/Test/TextureDataTest.cpp
@@ -37,7 +37,7 @@ class TextureDataTest: public TestSuite::Tester {
 };
 
 TextureDataTest::TextureDataTest() {
-    addTests({&TextureDataTest::debug});
+    addTests<TextureDataTest>({&TextureDataTest::debug});
 }
 
 void TextureDataTest::debug() {