diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp
index 8b7d169b5..f1665c383 100644
--- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp
+++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp
@@ -33,11 +33,10 @@
 
 namespace Magnum { namespace Audio { namespace Test {
 
-class AbstractImporterTest: public TestSuite::Tester {
-    public:
-        explicit AbstractImporterTest();
+struct AbstractImporterTest: TestSuite::Tester {
+    explicit AbstractImporterTest();
 
-        void openFile();
+    void openFile();
 };
 
 AbstractImporterTest::AbstractImporterTest() {
diff --git a/src/Magnum/Audio/Test/BufferTest.cpp b/src/Magnum/Audio/Test/BufferTest.cpp
index ef36e726c..187fa3d32 100644
--- a/src/Magnum/Audio/Test/BufferTest.cpp
+++ b/src/Magnum/Audio/Test/BufferTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Audio { namespace Test {
 
-class BufferTest: public TestSuite::Tester {
-    public:
-        explicit BufferTest();
+struct BufferTest: TestSuite::Tester {
+    explicit BufferTest();
 
-        void debugFormat();
+    void debugFormat();
 };
 
 BufferTest::BufferTest() {
diff --git a/src/Magnum/Audio/Test/RendererTest.cpp b/src/Magnum/Audio/Test/RendererTest.cpp
index 515c10aa9..5d3ae3829 100644
--- a/src/Magnum/Audio/Test/RendererTest.cpp
+++ b/src/Magnum/Audio/Test/RendererTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Audio { namespace Test {
 
-class RendererTest: public TestSuite::Tester {
-    public:
-        explicit RendererTest();
+struct RendererTest: TestSuite::Tester {
+    explicit RendererTest();
 
-        void debugError();
+    void debugError();
 };
 
 RendererTest::RendererTest() {
diff --git a/src/Magnum/Audio/Test/SourceTest.cpp b/src/Magnum/Audio/Test/SourceTest.cpp
index 2aa50e30f..d11361fa5 100644
--- a/src/Magnum/Audio/Test/SourceTest.cpp
+++ b/src/Magnum/Audio/Test/SourceTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Audio { namespace Test {
 
-class SourceTest: public TestSuite::Tester {
-    public:
-        explicit SourceTest();
+struct SourceTest: TestSuite::Tester {
+    explicit SourceTest();
 
-        void debugState();
+    void debugState();
 };
 
 SourceTest::SourceTest() {
diff --git a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
index 647a45cb8..23bd3a001 100644
--- a/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/CapsuleRendererTest.cpp
@@ -29,17 +29,16 @@
 
 namespace Magnum { namespace DebugTools { namespace Test {
 
-class CapsuleRendererTest: public TestSuite::Tester {
-    public:
-        explicit CapsuleRendererTest();
+struct CapsuleRendererTest: TestSuite::Tester {
+    explicit CapsuleRendererTest();
 
-        void zeroLength2D();
-        void common2D();
+    void zeroLength2D();
+    void common2D();
 
-        void zeroLength3D();
-        void parallel3D();
-        void antiParallel3D();
-        void common3D();
+    void zeroLength3D();
+    void parallel3D();
+    void antiParallel3D();
+    void common3D();
 };
 
 CapsuleRendererTest::CapsuleRendererTest() {
diff --git a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
index 6f5c93c85..807329bf5 100644
--- a/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/CylinderRendererTest.cpp
@@ -29,17 +29,16 @@
 
 namespace Magnum { namespace DebugTools { namespace Test {
 
-class CylinderRendererTest: public TestSuite::Tester {
-    public:
-        explicit CylinderRendererTest();
+struct CylinderRendererTest: TestSuite::Tester {
+    explicit CylinderRendererTest();
 
-        void zeroLength2D();
-        void common2D();
+    void zeroLength2D();
+    void common2D();
 
-        void zeroLength3D();
-        void parallel3D();
-        void antiParallel3D();
-        void common3D();
+    void zeroLength3D();
+    void parallel3D();
+    void antiParallel3D();
+    void common3D();
 };
 
 CylinderRendererTest::CylinderRendererTest() {
diff --git a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
index 3aae48f16..ef3f50c6f 100644
--- a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp
@@ -29,17 +29,16 @@
 
 namespace Magnum { namespace DebugTools { namespace Implementation { namespace Test {
 
-class ForceRendererTest: public TestSuite::Tester {
-    public:
-        explicit ForceRendererTest();
+struct ForceRendererTest: TestSuite::Tester {
+    explicit ForceRendererTest();
 
-        void zero2D();
-        void common2D();
+    void zero2D();
+    void common2D();
 
-        void zero3D();
-        void parallel3D();
-        void antiParallel3D();
-        void arbitrary3D();
+    void zero3D();
+    void parallel3D();
+    void antiParallel3D();
+    void arbitrary3D();
 };
 
 ForceRendererTest::ForceRendererTest() {
diff --git a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
index 557bc45b9..f3f925b3e 100644
--- a/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
+++ b/src/Magnum/DebugTools/Test/LineSegmentRendererTest.cpp
@@ -33,12 +33,11 @@
 
 namespace Magnum { namespace DebugTools { namespace Test {
 
-class LineSegmentRendererTest: public TestSuite::Tester {
-    public:
-        explicit LineSegmentRendererTest();
+struct LineSegmentRendererTest: TestSuite::Tester {
+    explicit LineSegmentRendererTest();
 
-        void line2D();
-        void line3D();
+    void line2D();
+    void line3D();
 };
 
 LineSegmentRendererTest::LineSegmentRendererTest() {
diff --git a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
index 6ec11a1c4..c7c6a826c 100644
--- a/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
+++ b/src/Magnum/Math/Algorithms/Test/GaussJordanTest.cpp
@@ -29,12 +29,11 @@
 
 namespace Magnum { namespace Math { namespace Algorithms { namespace Test {
 
-class GaussJordanTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit GaussJordanTest();
+struct GaussJordanTest: Corrade::TestSuite::Tester {
+    explicit GaussJordanTest();
 
-        void singular();
-        void invert();
+    void singular();
+    void invert();
 };
 
 typedef RectangularMatrix<4, 4, Float> Matrix4x4;
diff --git a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
index 5720cfab6..386cddc6f 100644
--- a/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
+++ b/src/Magnum/Math/Algorithms/Test/GramSchmidtTest.cpp
@@ -29,12 +29,11 @@
 
 namespace Magnum { namespace Math { namespace Algorithms { namespace Test {
 
-class GramSchmidtTest: public Corrade::TestSuite::Tester {
-    public:
-        GramSchmidtTest();
+struct GramSchmidtTest: Corrade::TestSuite::Tester {
+    explicit GramSchmidtTest();
 
-        void orthogonalize();
-        void orthonormalize();
+    void orthogonalize();
+    void orthonormalize();
 };
 
 typedef RectangularMatrix<3, 3, Float> Matrix3x3;
diff --git a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
index cc9101885..e17de15bf 100644
--- a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
+++ b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp
@@ -29,12 +29,11 @@
 
 namespace Magnum { namespace Math { namespace Algorithms { namespace Test {
 
-class SvdTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit SvdTest();
+struct SvdTest: Corrade::TestSuite::Tester {
+    explicit SvdTest();
 
-        void testDouble();
-        void testFloat();
+    void testDouble();
+    void testFloat();
 };
 
 #ifndef MAGNUM_TARGET_GLES
diff --git a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
index ade867d0c..d5f4779cd 100644
--- a/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
+++ b/src/Magnum/Math/Geometry/Test/DistanceTest.cpp
@@ -30,14 +30,13 @@
 
 namespace Magnum { namespace Math { namespace Geometry { namespace Test {
 
-class DistanceTest: public Corrade::TestSuite::Tester {
-    public:
-        DistanceTest();
-
-        void linePoint2D();
-        void linePoint3D();
-        void lineSegmentPoint2D();
-        void lineSegmentPoint3D();
+struct DistanceTest: Corrade::TestSuite::Tester {
+    explicit DistanceTest();
+
+    void linePoint2D();
+    void linePoint3D();
+    void lineSegmentPoint2D();
+    void lineSegmentPoint3D();
 };
 
 typedef Math::Vector2<Float> Vector2;
diff --git a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
index bf0629e3c..39036293c 100644
--- a/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
+++ b/src/Magnum/Math/Geometry/Test/IntersectionTest.cpp
@@ -29,12 +29,11 @@
 
 namespace Magnum { namespace Math { namespace Geometry { namespace Test {
 
-class IntersectionTest: public Corrade::TestSuite::Tester {
-    public:
-        IntersectionTest();
+struct IntersectionTest: Corrade::TestSuite::Tester {
+    explicit IntersectionTest();
 
-        void planeLine();
-        void lineLine();
+    void planeLine();
+    void lineLine();
 };
 
 typedef Math::Vector2<Float> Vector2;
diff --git a/src/Magnum/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp
index a537ff927..06d477d90 100644
--- a/src/Magnum/Math/Test/AngleTest.cpp
+++ b/src/Magnum/Math/Test/AngleTest.cpp
@@ -30,16 +30,15 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class AngleTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit AngleTest();
+struct AngleTest: Corrade::TestSuite::Tester {
+    explicit AngleTest();
 
-        void construct();
-        void literals();
-        void conversion();
+    void construct();
+    void literals();
+    void conversion();
 
-        void debugDeg();
-        void debugRad();
+    void debugDeg();
+    void debugRad();
 };
 
 typedef Math::Deg<Float> Deg;
diff --git a/src/Magnum/Math/Test/BoolVectorTest.cpp b/src/Magnum/Math/Test/BoolVectorTest.cpp
index b58f2b2f0..e835968d4 100644
--- a/src/Magnum/Math/Test/BoolVectorTest.cpp
+++ b/src/Magnum/Math/Test/BoolVectorTest.cpp
@@ -30,27 +30,26 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class BoolVectorTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit BoolVectorTest();
-
-        void construct();
-        void constructDefault();
-        void constructOneValue();
-        void constructOneElement();
-        void constructCopy();
-        void data();
-
-        void compare();
-        void compareUndefined();
-        void all();
-        void none();
-        void any();
-
-        void bitInverse();
-        void bitAndOrXor();
-
-        void debug();
+struct BoolVectorTest: Corrade::TestSuite::Tester {
+    explicit BoolVectorTest();
+
+    void construct();
+    void constructDefault();
+    void constructOneValue();
+    void constructOneElement();
+    void constructCopy();
+    void data();
+
+    void compare();
+    void compareUndefined();
+    void all();
+    void none();
+    void any();
+
+    void bitInverse();
+    void bitAndOrXor();
+
+    void debug();
 };
 
 static_assert(BoolVector<15>::DataSize == 2, "Improper DataSize");
diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp
index dfed35415..cd654a1cb 100644
--- a/src/Magnum/Math/Test/ComplexTest.cpp
+++ b/src/Magnum/Math/Test/ComplexTest.cpp
@@ -31,38 +31,37 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class ComplexTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit ComplexTest();
-
-        void construct();
-        void constructDefault();
-        void constructFromVector();
-        void constructCopy();
-
-        void compare();
-        void isNormalized();
-
-        void addSubtract();
-        void negated();
-        void multiplyDivideScalar();
-        void multiply();
-
-        void dot();
-        void dotSelf();
-        void length();
-        void normalized();
-
-        void conjugated();
-        void inverted();
-        void invertedNormalized();
-
-        void angle();
-        void rotation();
-        void matrix();
-        void transformVector();
-
-        void debug();
+struct ComplexTest: Corrade::TestSuite::Tester {
+    explicit ComplexTest();
+
+    void construct();
+    void constructDefault();
+    void constructFromVector();
+    void constructCopy();
+
+    void compare();
+    void isNormalized();
+
+    void addSubtract();
+    void negated();
+    void multiplyDivideScalar();
+    void multiply();
+
+    void dot();
+    void dotSelf();
+    void length();
+    void normalized();
+
+    void conjugated();
+    void inverted();
+    void invertedNormalized();
+
+    void angle();
+    void rotation();
+    void matrix();
+    void transformVector();
+
+    void debug();
 };
 
 ComplexTest::ComplexTest() {
diff --git a/src/Magnum/Math/Test/ConstantsTest.cpp b/src/Magnum/Math/Test/ConstantsTest.cpp
index 7f9db4aa5..2dc02c581 100644
--- a/src/Magnum/Math/Test/ConstantsTest.cpp
+++ b/src/Magnum/Math/Test/ConstantsTest.cpp
@@ -30,12 +30,11 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class ConstantsTest: public Corrade::TestSuite::Tester {
-    public:
-        ConstantsTest();
+struct ConstantsTest: Corrade::TestSuite::Tester {
+    explicit ConstantsTest();
 
-        void constants();
-        void specials();
+    void constants();
+    void specials();
 
     private:
         template<class> void _constants();
diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp
index 95166e687..0fe63828b 100644
--- a/src/Magnum/Math/Test/DualComplexTest.cpp
+++ b/src/Magnum/Math/Test/DualComplexTest.cpp
@@ -31,36 +31,35 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class DualComplexTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit DualComplexTest();
+struct DualComplexTest: Corrade::TestSuite::Tester {
+    explicit DualComplexTest();
 
-        void construct();
-        void constructDefault();
-        void constructFromVector();
-        void constructCopy();
+    void construct();
+    void constructDefault();
+    void constructFromVector();
+    void constructCopy();
 
-        void isNormalized();
+    void isNormalized();
 
-        void multiply();
+    void multiply();
 
-        void lengthSquared();
-        void length();
-        void normalized();
+    void lengthSquared();
+    void length();
+    void normalized();
 
-        void complexConjugated();
-        void dualConjugated();
-        void conjugated();
-        void inverted();
-        void invertedNormalized();
+    void complexConjugated();
+    void dualConjugated();
+    void conjugated();
+    void inverted();
+    void invertedNormalized();
 
-        void rotation();
-        void translation();
-        void combinedTransformParts();
-        void matrix();
-        void transformPoint();
+    void rotation();
+    void translation();
+    void combinedTransformParts();
+    void matrix();
+    void transformPoint();
 
-        void debug();
+    void debug();
 };
 
 typedef Math::Deg<Float> Deg;
diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp
index 2b41df3c1..6dda7f02b 100644
--- a/src/Magnum/Math/Test/DualQuaternionTest.cpp
+++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp
@@ -30,35 +30,34 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class DualQuaternionTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit DualQuaternionTest();
-
-        void construct();
-        void constructDefault();
-        void constructFromVector();
-        void constructCopy();
-
-        void isNormalized();
-
-        void lengthSquared();
-        void length();
-        void normalized();
-
-        void quaternionConjugated();
-        void dualConjugated();
-        void conjugated();
-        void inverted();
-        void invertedNormalized();
-
-        void rotation();
-        void translation();
-        void combinedTransformParts();
-        void matrix();
-        void transformPoint();
-        void transformPointNormalized();
-
-        void debug();
+struct DualQuaternionTest: Corrade::TestSuite::Tester {
+    explicit DualQuaternionTest();
+
+    void construct();
+    void constructDefault();
+    void constructFromVector();
+    void constructCopy();
+
+    void isNormalized();
+
+    void lengthSquared();
+    void length();
+    void normalized();
+
+    void quaternionConjugated();
+    void dualConjugated();
+    void conjugated();
+    void inverted();
+    void invertedNormalized();
+
+    void rotation();
+    void translation();
+    void combinedTransformParts();
+    void matrix();
+    void transformPoint();
+    void transformPointNormalized();
+
+    void debug();
 };
 
 typedef Math::Deg<Float> Deg;
diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp
index 78537871d..01ec3b44d 100644
--- a/src/Magnum/Math/Test/DualTest.cpp
+++ b/src/Magnum/Math/Test/DualTest.cpp
@@ -30,24 +30,23 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class DualTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit DualTest();
+struct DualTest: Corrade::TestSuite::Tester {
+    explicit DualTest();
 
-        void construct();
-        void constructDefault();
-        void constructCopy();
+    void construct();
+    void constructDefault();
+    void constructCopy();
 
-        void compare();
+    void compare();
 
-        void addSubtract();
-        void negated();
-        void multiplyDivide();
+    void addSubtract();
+    void negated();
+    void multiplyDivide();
 
-        void conjugated();
-        void sqrt();
+    void conjugated();
+    void sqrt();
 
-        void debug();
+    void debug();
 };
 
 typedef Math::Dual<Float> Dual;
diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp
index ba16f618d..564bff971 100644
--- a/src/Magnum/Math/Test/FunctionsTest.cpp
+++ b/src/Magnum/Math/Test/FunctionsTest.cpp
@@ -30,44 +30,43 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class FunctionsTest: public Corrade::TestSuite::Tester {
-    public:
-        FunctionsTest();
-
-        void min();
-        void minList();
-        void max();
-        void maxList();
-        void minmax();
-        void clamp();
-        void nanPropagation();
-
-        void sign();
-        void abs();
-
-        void floor();
-        void round();
-        void ceil();
-
-        void sqrt();
-        void sqrtInverted();
-        void lerp();
-        void lerpInverted();
-        void fma();
-        void normalizeUnsigned();
-        void normalizeSigned();
-        void denormalizeUnsigned();
-        void denormalizeSigned();
-        void renormalizeUnsinged();
-        void renormalizeSinged();
-
-        void normalizeTypeDeduction();
-
-        void pow();
-        void log();
-        void log2();
-        void trigonometric();
-        void trigonometricWithBase();
+struct FunctionsTest: Corrade::TestSuite::Tester {
+    explicit FunctionsTest();
+
+    void min();
+    void minList();
+    void max();
+    void maxList();
+    void minmax();
+    void clamp();
+    void nanPropagation();
+
+    void sign();
+    void abs();
+
+    void floor();
+    void round();
+    void ceil();
+
+    void sqrt();
+    void sqrtInverted();
+    void lerp();
+    void lerpInverted();
+    void fma();
+    void normalizeUnsigned();
+    void normalizeSigned();
+    void denormalizeUnsigned();
+    void denormalizeSigned();
+    void renormalizeUnsinged();
+    void renormalizeSinged();
+
+    void normalizeTypeDeduction();
+
+    void pow();
+    void log();
+    void log2();
+    void trigonometric();
+    void trigonometricWithBase();
 };
 
 typedef Math::Constants<Float> Constants;
diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp
index ea8722b74..7a9b13480 100644
--- a/src/Magnum/Math/Test/Matrix3Test.cpp
+++ b/src/Magnum/Math/Test/Matrix3Test.cpp
@@ -56,37 +56,36 @@ template<> struct RectangularMatrixConverter<3, 3, float, Mat3> {
 
 namespace Test {
 
-class Matrix3Test: public Corrade::TestSuite::Tester {
-    public:
-        Matrix3Test();
-
-        void construct();
-        void constructIdentity();
-        void constructZero();
-        void constructConversion();
-        void constructCopy();
-
-        void convert();
-
-        void isRigidTransformation();
-
-        void translation();
-        void scaling();
-        void rotation();
-        void reflection();
-        void reflectionIsScaling();
-        void projection();
-        void fromParts();
-        void rotationScalingPart();
-        void rotationNormalizedPart();
-        void rotationPart();
-        void uniformScalingPart();
-        void vectorParts();
-        void invertedRigid();
-        void transform();
-
-        void debug();
-        void configuration();
+struct Matrix3Test: Corrade::TestSuite::Tester {
+    explicit Matrix3Test();
+
+    void construct();
+    void constructIdentity();
+    void constructZero();
+    void constructConversion();
+    void constructCopy();
+
+    void convert();
+
+    void isRigidTransformation();
+
+    void translation();
+    void scaling();
+    void rotation();
+    void reflection();
+    void reflectionIsScaling();
+    void projection();
+    void fromParts();
+    void rotationScalingPart();
+    void rotationNormalizedPart();
+    void rotationPart();
+    void uniformScalingPart();
+    void vectorParts();
+    void invertedRigid();
+    void transform();
+
+    void debug();
+    void configuration();
 };
 
 typedef Math::Deg<Float> Deg;
diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp
index e5a82dc7e..2dfcd68c1 100644
--- a/src/Magnum/Math/Test/Matrix4Test.cpp
+++ b/src/Magnum/Math/Test/Matrix4Test.cpp
@@ -58,42 +58,41 @@ template<> struct RectangularMatrixConverter<4, 4, float, Mat4> {
 
 namespace Test {
 
-class Matrix4Test: public Corrade::TestSuite::Tester {
-    public:
-        Matrix4Test();
-
-        void construct();
-        void constructIdentity();
-        void constructZero();
-        void constructConversion();
-        void constructCopy();
-
-        void convert();
-
-        void isRigidTransformation();
-
-        void translation();
-        void scaling();
-        void rotation();
-        void rotationX();
-        void rotationY();
-        void rotationZ();
-        void reflection();
-        void reflectionIsScaling();
-        void orthographicProjection();
-        void perspectiveProjection();
-        void perspectiveProjectionFov();
-        void fromParts();
-        void rotationScalingPart();
-        void rotationNormalizedPart();
-        void rotationPart();
-        void uniformScalingPart();
-        void vectorParts();
-        void invertedRigid();
-        void transform();
-
-        void debug();
-        void configuration();
+struct Matrix4Test: Corrade::TestSuite::Tester {
+    explicit Matrix4Test();
+
+    void construct();
+    void constructIdentity();
+    void constructZero();
+    void constructConversion();
+    void constructCopy();
+
+    void convert();
+
+    void isRigidTransformation();
+
+    void translation();
+    void scaling();
+    void rotation();
+    void rotationX();
+    void rotationY();
+    void rotationZ();
+    void reflection();
+    void reflectionIsScaling();
+    void orthographicProjection();
+    void perspectiveProjection();
+    void perspectiveProjectionFov();
+    void fromParts();
+    void rotationScalingPart();
+    void rotationNormalizedPart();
+    void rotationPart();
+    void uniformScalingPart();
+    void vectorParts();
+    void invertedRigid();
+    void transform();
+
+    void debug();
+    void configuration();
 };
 
 typedef Math::Deg<Float> Deg;
diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp
index a3ac268c2..cfba8d4f4 100644
--- a/src/Magnum/Math/Test/MatrixTest.cpp
+++ b/src/Magnum/Math/Test/MatrixTest.cpp
@@ -56,31 +56,30 @@ template<> struct RectangularMatrixConverter<3, 3, float, Mat3> {
 
 namespace Test {
 
-class MatrixTest: public Corrade::TestSuite::Tester {
-    public:
-        MatrixTest();
+struct MatrixTest: Corrade::TestSuite::Tester {
+    explicit MatrixTest();
 
-        void construct();
-        void constructIdentity();
-        void constructZero();
-        void constructConversion();
-        void constructCopy();
+    void construct();
+    void constructIdentity();
+    void constructZero();
+    void constructConversion();
+    void constructCopy();
 
-        void convert();
+    void convert();
 
-        void isOrthogonal();
+    void isOrthogonal();
 
-        void trace();
-        void ij();
-        void determinant();
-        void inverted();
-        void invertedOrthogonal();
+    void trace();
+    void ij();
+    void determinant();
+    void inverted();
+    void invertedOrthogonal();
 
-        void subclassTypes();
-        void subclass();
+    void subclassTypes();
+    void subclass();
 
-        void debug();
-        void configuration();
+    void debug();
+    void configuration();
 };
 
 typedef Matrix<4, Float> Matrix4x4;
diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp
index 7a2eab4b1..479bb8342 100644
--- a/src/Magnum/Math/Test/QuaternionTest.cpp
+++ b/src/Magnum/Math/Test/QuaternionTest.cpp
@@ -31,41 +31,40 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class QuaternionTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit QuaternionTest();
-
-        void construct();
-        void constructDefault();
-        void constructFromVector();
-        void constructCopy();
-
-        void compare();
-        void isNormalized();
-
-        void addSubtract();
-        void negated();
-        void multiplyDivideScalar();
-        void multiply();
-
-        void dot();
-        void dotSelf();
-        void length();
-        void normalized();
-
-        void conjugated();
-        void inverted();
-        void invertedNormalized();
-
-        void rotation();
-        void angle();
-        void matrix();
-        void lerp();
-        void slerp();
-        void transformVector();
-        void transformVectorNormalized();
-
-        void debug();
+struct QuaternionTest: Corrade::TestSuite::Tester {
+    explicit QuaternionTest();
+
+    void construct();
+    void constructDefault();
+    void constructFromVector();
+    void constructCopy();
+
+    void compare();
+    void isNormalized();
+
+    void addSubtract();
+    void negated();
+    void multiplyDivideScalar();
+    void multiply();
+
+    void dot();
+    void dotSelf();
+    void length();
+    void normalized();
+
+    void conjugated();
+    void inverted();
+    void invertedNormalized();
+
+    void rotation();
+    void angle();
+    void matrix();
+    void lerp();
+    void slerp();
+    void transformVector();
+    void transformVectorNormalized();
+
+    void debug();
 };
 
 typedef Math::Deg<Float> Deg;
diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp
index 4af800487..fd5d1c357 100644
--- a/src/Magnum/Math/Test/RangeTest.cpp
+++ b/src/Magnum/Math/Test/RangeTest.cpp
@@ -35,34 +35,33 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class RangeTest: public Corrade::TestSuite::Tester {
-    public:
-        RangeTest();
+struct RangeTest: Corrade::TestSuite::Tester {
+    explicit RangeTest();
 
-        void construct();
-        void constructDefault();
-        void constructFromSize();
-        void constructConversion();
-        void constructCopy();
+    void construct();
+    void constructDefault();
+    void constructFromSize();
+    void constructConversion();
+    void constructCopy();
 
-        void access();
-        void compare();
-        void size();
-        void center();
+    void access();
+    void compare();
+    void size();
+    void center();
 
-        void translated();
-        void padded();
-        void scaled();
+    void translated();
+    void padded();
+    void scaled();
 
-        void subclassTypes();
-        void subclass();
+    void subclassTypes();
+    void subclass();
 
-        #ifdef MAGNUM_BUILD_DEPRECATED
-        void deprecated();
-        #endif
+    #ifdef MAGNUM_BUILD_DEPRECATED
+    void deprecated();
+    #endif
 
-        void debug();
-        void configuration();
+    void debug();
+    void configuration();
 };
 
 typedef Math::Range1D<Float> Range1D;
diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp
index f63fa8706..c26a7c2fa 100644
--- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp
+++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp
@@ -54,39 +54,38 @@ template<> struct RectangularMatrixConverter<2, 3, float, Mat2x3> {
 
 namespace Test {
 
-class RectangularMatrixTest: public Corrade::TestSuite::Tester {
-    public:
-        RectangularMatrixTest();
+struct RectangularMatrixTest: Corrade::TestSuite::Tester {
+    explicit RectangularMatrixTest();
 
-        void construct();
-        void constructDefault();
-        void constructConversion();
-        void constructFromData();
-        void constructFromDiagonal();
-        void constructCopy();
+    void construct();
+    void constructDefault();
+    void constructConversion();
+    void constructFromData();
+    void constructFromDiagonal();
+    void constructCopy();
 
-        void convert();
-        void data();
-        void row();
+    void convert();
+    void data();
+    void row();
 
-        void compare();
+    void compare();
 
-        void negative();
-        void addSubtract();
-        void multiplyDivide();
-        void multiply();
-        void multiplyVector();
+    void negative();
+    void addSubtract();
+    void multiplyDivide();
+    void multiply();
+    void multiplyVector();
 
-        void transposed();
-        void diagonal();
+    void transposed();
+    void diagonal();
 
-        void vector();
+    void vector();
 
-        void subclassTypes();
-        void subclass();
+    void subclassTypes();
+    void subclass();
 
-        void debug();
-        void configuration();
+    void debug();
+    void configuration();
 };
 
 typedef RectangularMatrix<4, 3, Float> Matrix4x3;
diff --git a/src/Magnum/Math/Test/SwizzleTest.cpp b/src/Magnum/Math/Test/SwizzleTest.cpp
index eccb5d4fd..4c051c7ec 100644
--- a/src/Magnum/Math/Test/SwizzleTest.cpp
+++ b/src/Magnum/Math/Test/SwizzleTest.cpp
@@ -29,14 +29,13 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class SwizzleTest: public Corrade::TestSuite::Tester {
-    public:
-        SwizzleTest();
-
-        void components();
-        void constants();
-        void rgba();
-        void sizes();
+struct SwizzleTest: Corrade::TestSuite::Tester {
+    explicit SwizzleTest();
+
+    void components();
+    void constants();
+    void rgba();
+    void sizes();
 };
 
 typedef Vector<4, Int> Vector4i;
diff --git a/src/Magnum/Math/Test/TypeTraitsTest.cpp b/src/Magnum/Math/Test/TypeTraitsTest.cpp
index 124a2162b..3acafbe85 100644
--- a/src/Magnum/Math/Test/TypeTraitsTest.cpp
+++ b/src/Magnum/Math/Test/TypeTraitsTest.cpp
@@ -30,16 +30,15 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class TypeTraitsTest: public Corrade::TestSuite::Tester {
-    public:
-        TypeTraitsTest();
-
-        void equalsIntegral();
-        void equalsFloatingPoint0();
-        void equalsFloatingPoint1();
-        void equalsFloatingPointLarge();
-        void equalsFloatingPointInfinity();
-        void equalsFloatingPointNaN();
+struct TypeTraitsTest: Corrade::TestSuite::Tester {
+    explicit TypeTraitsTest();
+
+    void equalsIntegral();
+    void equalsFloatingPoint0();
+    void equalsFloatingPoint1();
+    void equalsFloatingPointLarge();
+    void equalsFloatingPointInfinity();
+    void equalsFloatingPointNaN();
 
     private:
         template<class> void _equalsIntegral();
diff --git a/src/Magnum/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp
index d7b3fc108..96829adb8 100644
--- a/src/Magnum/Math/Test/UnitTest.cpp
+++ b/src/Magnum/Math/Test/UnitTest.cpp
@@ -29,18 +29,17 @@
 
 namespace Magnum { namespace Math { namespace Test {
 
-class UnitTest: public Corrade::TestSuite::Tester {
-    public:
-        explicit UnitTest();
-
-        void construct();
-        void constructDefault();
-        void constructConversion();
-        void compare();
-
-        void negated();
-        void addSubtract();
-        void multiplyDivide();
+struct UnitTest: Corrade::TestSuite::Tester {
+    explicit UnitTest();
+
+    void construct();
+    void constructDefault();
+    void constructConversion();
+    void compare();
+
+    void negated();
+    void addSubtract();
+    void multiplyDivide();
 };
 
 UnitTest::UnitTest() {
diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp
index 1d3e76635..61664c404 100644
--- a/src/Magnum/Math/Test/Vector2Test.cpp
+++ b/src/Magnum/Math/Test/Vector2Test.cpp
@@ -51,29 +51,28 @@ template<> struct VectorConverter<2, float, Vec2> {
 
 namespace Test {
 
-class Vector2Test: public Corrade::TestSuite::Tester {
-    public:
-        Vector2Test();
-
-        void construct();
-        void constructDefault();
-        void constructOneValue();
-        void constructConversion();
-        void constructCopy();
-
-        void convert();
-
-        void access();
-        void cross();
-        void axes();
-        void scales();
-        void perpendicular();
-        void aspectRatio();
-        void minmax();
-
-        void swizzleType();
-        void debug();
-        void configuration();
+struct Vector2Test: Corrade::TestSuite::Tester {
+    explicit Vector2Test();
+
+    void construct();
+    void constructDefault();
+    void constructOneValue();
+    void constructConversion();
+    void constructCopy();
+
+    void convert();
+
+    void access();
+    void cross();
+    void axes();
+    void scales();
+    void perpendicular();
+    void aspectRatio();
+    void minmax();
+
+    void swizzleType();
+    void debug();
+    void configuration();
 };
 
 typedef Math::Vector3<Int> Vector3i;
diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp
index e1d2871d2..9c32093d3 100644
--- a/src/Magnum/Math/Test/Vector3Test.cpp
+++ b/src/Magnum/Math/Test/Vector3Test.cpp
@@ -51,28 +51,27 @@ template<> struct VectorConverter<3, float, Vec3> {
 
 namespace Test {
 
-class Vector3Test: public Corrade::TestSuite::Tester {
-    public:
-        Vector3Test();
-
-        void construct();
-        void constructDefault();
-        void constructOneValue();
-        void constructParts();
-        void constructConversion();
-        void constructCopy();
-
-        void convert();
-
-        void access();
-        void cross();
-        void axes();
-        void scales();
-        void twoComponent();
-
-        void swizzleType();
-        void debug();
-        void configuration();
+struct Vector3Test: Corrade::TestSuite::Tester {
+    explicit Vector3Test();
+
+    void construct();
+    void constructDefault();
+    void constructOneValue();
+    void constructParts();
+    void constructConversion();
+    void constructCopy();
+
+    void convert();
+
+    void access();
+    void cross();
+    void axes();
+    void scales();
+    void twoComponent();
+
+    void swizzleType();
+    void debug();
+    void configuration();
 };
 
 typedef Math::Vector3<Float> Vector3;
diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp
index d821733d0..c60f86174 100644
--- a/src/Magnum/Math/Test/Vector4Test.cpp
+++ b/src/Magnum/Math/Test/Vector4Test.cpp
@@ -51,26 +51,25 @@ template<> struct VectorConverter<4, float, Vec4> {
 
 namespace Test {
 
-class Vector4Test: public Corrade::TestSuite::Tester {
-    public:
-        Vector4Test();
-
-        void construct();
-        void constructDefault();
-        void constructOneValue();
-        void constructParts();
-        void constructConversion();
-        void constructCopy();
-
-        void convert();
-
-        void access();
-        void threeComponent();
-        void twoComponent();
-
-        void swizzleType();
-        void debug();
-        void configuration();
+struct Vector4Test: Corrade::TestSuite::Tester {
+    explicit Vector4Test();
+
+    void construct();
+    void constructDefault();
+    void constructOneValue();
+    void constructParts();
+    void constructConversion();
+    void constructCopy();
+
+    void convert();
+
+    void access();
+    void threeComponent();
+    void twoComponent();
+
+    void swizzleType();
+    void debug();
+    void configuration();
 };
 
 typedef Math::Vector4<Float> Vector4;
diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp
index bd7fb5733..426ffbe46 100644
--- a/src/Magnum/Math/Test/VectorTest.cpp
+++ b/src/Magnum/Math/Test/VectorTest.cpp
@@ -51,57 +51,56 @@ template<> struct VectorConverter<3, float, Vec3> {
 
 namespace Test {
 
-class VectorTest: public Corrade::TestSuite::Tester {
-    public:
-        VectorTest();
-
-        void construct();
-        void constructFromData();
-        void constructDefault();
-        void constructOneValue();
-        void constructOneComponent();
-        void constructConversion();
-        void constructCopy();
-
-        void isZero();
-        void isNormalized();
-
-        void convert();
-        void data();
-
-        void negative();
-        void addSubtract();
-        void multiplyDivide();
-        void multiplyDivideIntegral();
-        void multiplyDivideComponentWise();
-        void multiplyDivideComponentWiseIntegral();
-        void modulo();
-        void bitwise();
-
-        void compare();
-        void compareComponentWise();
-
-        void dot();
-        void dotSelf();
-        void length();
-        void lengthInverted();
-        void normalized();
-        void resized();
-
-        void sum();
-        void product();
-        void min();
-        void max();
-
-        void projected();
-        void projectedOntoNormalized();
-        void angle();
-
-        void subclassTypes();
-        void subclass();
-
-        void debug();
-        void configuration();
+struct VectorTest: Corrade::TestSuite::Tester {
+    explicit VectorTest();
+
+    void construct();
+    void constructFromData();
+    void constructDefault();
+    void constructOneValue();
+    void constructOneComponent();
+    void constructConversion();
+    void constructCopy();
+
+    void isZero();
+    void isNormalized();
+
+    void convert();
+    void data();
+
+    void negative();
+    void addSubtract();
+    void multiplyDivide();
+    void multiplyDivideIntegral();
+    void multiplyDivideComponentWise();
+    void multiplyDivideComponentWiseIntegral();
+    void modulo();
+    void bitwise();
+
+    void compare();
+    void compareComponentWise();
+
+    void dot();
+    void dotSelf();
+    void length();
+    void lengthInverted();
+    void normalized();
+    void resized();
+
+    void sum();
+    void product();
+    void min();
+    void max();
+
+    void projected();
+    void projectedOntoNormalized();
+    void angle();
+
+    void subclassTypes();
+    void subclass();
+
+    void debug();
+    void configuration();
 };
 
 typedef Math::Rad<Float> Rad;
diff --git a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
index d35a7a743..d40dfecb4 100644
--- a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
+++ b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp
@@ -32,13 +32,12 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class CombineIndexedArraysTest: public TestSuite::Tester {
-    public:
-        CombineIndexedArraysTest();
+struct CombineIndexedArraysTest: TestSuite::Tester {
+    explicit CombineIndexedArraysTest();
 
-        void wrongIndexCount();
-        void indexArrays();
-        void indexedArrays();
+    void wrongIndexCount();
+    void indexArrays();
+    void indexedArrays();
 };
 
 CombineIndexedArraysTest::CombineIndexedArraysTest() {
diff --git a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
index 2e99b36f4..db392fe4a 100644
--- a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
+++ b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp
@@ -31,13 +31,12 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class CompressIndicesTest: public TestSuite::Tester {
-    public:
-        CompressIndicesTest();
+struct CompressIndicesTest: TestSuite::Tester {
+    explicit CompressIndicesTest();
 
-        void compressChar();
-        void compressShort();
-        void compressInt();
+    void compressChar();
+    void compressShort();
+    void compressInt();
 };
 
 CompressIndicesTest::CompressIndicesTest() {
diff --git a/src/Magnum/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp
index 818ecdb2d..4596cbd89 100644
--- a/src/Magnum/MeshTools/Test/DuplicateTest.cpp
+++ b/src/Magnum/MeshTools/Test/DuplicateTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class DuplicateTest: public TestSuite::Tester {
-    public:
-        explicit DuplicateTest();
+struct DuplicateTest: TestSuite::Tester {
+    explicit DuplicateTest();
 
-        void duplicate();
+    void duplicate();
 };
 
 DuplicateTest::DuplicateTest() {
diff --git a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
index 4e9421625..578836b3f 100644
--- a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
+++ b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp
@@ -31,13 +31,12 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class FlipNormalsTest: public TestSuite::Tester {
-    public:
-        FlipNormalsTest();
+struct FlipNormalsTest: TestSuite::Tester {
+    explicit FlipNormalsTest();
 
-        void wrongIndexCount();
-        void flipFaceWinding();
-        void flipNormals();
+    void wrongIndexCount();
+    void flipFaceWinding();
+    void flipNormals();
 };
 
 FlipNormalsTest::FlipNormalsTest() {
diff --git a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
index 32bea6f8a..df1c3ae87 100644
--- a/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
+++ b/src/Magnum/MeshTools/Test/GenerateFlatNormalsTest.cpp
@@ -31,12 +31,11 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class GenerateFlatNormalsTest: public TestSuite::Tester {
-    public:
-        GenerateFlatNormalsTest();
+struct GenerateFlatNormalsTest: TestSuite::Tester {
+    explicit GenerateFlatNormalsTest();
 
-        void wrongIndexCount();
-        void generate();
+    void wrongIndexCount();
+    void generate();
 };
 
 GenerateFlatNormalsTest::GenerateFlatNormalsTest() {
diff --git a/src/Magnum/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp
index ab511eb14..9616fd5c4 100644
--- a/src/Magnum/MeshTools/Test/InterleaveTest.cpp
+++ b/src/Magnum/MeshTools/Test/InterleaveTest.cpp
@@ -32,18 +32,17 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class InterleaveTest: public Corrade::TestSuite::Tester {
-    public:
-        InterleaveTest();
-
-        void attributeCount();
-        void attributeCountGaps();
-        void stride();
-        void strideGaps();
-        void write();
-        void writeGaps();
-
-        void interleaveInto();
+struct InterleaveTest: Corrade::TestSuite::Tester {
+    explicit InterleaveTest();
+
+    void attributeCount();
+    void attributeCountGaps();
+    void stride();
+    void strideGaps();
+    void write();
+    void writeGaps();
+
+    void interleaveInto();
 };
 
 InterleaveTest::InterleaveTest() {
diff --git a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
index 15313078f..080d2e132 100644
--- a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
+++ b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class RemoveDuplicatesTest: public TestSuite::Tester {
-    public:
-        RemoveDuplicatesTest();
+struct RemoveDuplicatesTest: TestSuite::Tester {
+    explicit RemoveDuplicatesTest();
 
-        void removeDuplicates();
+    void removeDuplicates();
 };
 
 RemoveDuplicatesTest::RemoveDuplicatesTest() {
diff --git a/src/Magnum/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp
index d3e9a2313..5a70aad95 100644
--- a/src/Magnum/MeshTools/Test/SubdivideTest.cpp
+++ b/src/Magnum/MeshTools/Test/SubdivideTest.cpp
@@ -31,12 +31,11 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class SubdivideTest: public TestSuite::Tester {
-    public:
-        SubdivideTest();
+struct SubdivideTest: TestSuite::Tester {
+    explicit SubdivideTest();
 
-        void wrongIndexCount();
-        void subdivide();
+    void wrongIndexCount();
+    void subdivide();
 };
 
 namespace {
diff --git a/src/Magnum/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp
index f2a8a7476..8af9c8a9f 100644
--- a/src/Magnum/MeshTools/Test/TransformTest.cpp
+++ b/src/Magnum/MeshTools/Test/TransformTest.cpp
@@ -32,15 +32,14 @@
 
 namespace Magnum { namespace MeshTools { namespace Test {
 
-class TransformTest: public TestSuite::Tester {
-    public:
-        explicit TransformTest();
+struct TransformTest: TestSuite::Tester {
+    explicit TransformTest();
 
-        void transformVectors2D();
-        void transformVectors3D();
+    void transformVectors2D();
+    void transformVectors3D();
 
-        void transformPoints2D();
-        void transformPoints3D();
+    void transformPoints2D();
+    void transformPoints3D();
 };
 
 TransformTest::TransformTest() {
diff --git a/src/Magnum/Primitives/Test/CapsuleTest.cpp b/src/Magnum/Primitives/Test/CapsuleTest.cpp
index 5b3360f86..34595ac19 100644
--- a/src/Magnum/Primitives/Test/CapsuleTest.cpp
+++ b/src/Magnum/Primitives/Test/CapsuleTest.cpp
@@ -33,15 +33,14 @@
 
 namespace Magnum { namespace Primitives { namespace Test {
 
-class CapsuleTest: public TestSuite::Tester {
-    public:
-        CapsuleTest();
+struct CapsuleTest: TestSuite::Tester {
+    explicit CapsuleTest();
 
-        void wireframe2D();
+    void wireframe2D();
 
-        void solid3DWithoutTextureCoords();
-        void solid3DWithTextureCoords();
-        void wireframe3D();
+    void solid3DWithoutTextureCoords();
+    void solid3DWithTextureCoords();
+    void wireframe3D();
 };
 
 CapsuleTest::CapsuleTest() {
diff --git a/src/Magnum/Primitives/Test/CircleTest.cpp b/src/Magnum/Primitives/Test/CircleTest.cpp
index 4f1a178e7..f90598aed 100644
--- a/src/Magnum/Primitives/Test/CircleTest.cpp
+++ b/src/Magnum/Primitives/Test/CircleTest.cpp
@@ -31,12 +31,11 @@
 
 namespace Magnum { namespace Primitives { namespace Test {
 
-class CircleTest: public TestSuite::Tester {
-    public:
-        explicit CircleTest();
+struct CircleTest: TestSuite::Tester {
+    explicit CircleTest();
 
-        void solid();
-        void wireframe();
+    void solid();
+    void wireframe();
 };
 
 CircleTest::CircleTest() {
diff --git a/src/Magnum/Primitives/Test/CylinderTest.cpp b/src/Magnum/Primitives/Test/CylinderTest.cpp
index 29637bb14..6a95fe870 100644
--- a/src/Magnum/Primitives/Test/CylinderTest.cpp
+++ b/src/Magnum/Primitives/Test/CylinderTest.cpp
@@ -32,13 +32,12 @@
 
 namespace Magnum { namespace Primitives { namespace Test {
 
-class CylinderTest: public TestSuite::Tester {
-    public:
-        CylinderTest();
+struct CylinderTest: TestSuite::Tester {
+    explicit CylinderTest();
 
-        void solidWithoutAnything();
-        void solidWithTextureCoordsAndCaps();
-        void wireframe();
+    void solidWithoutAnything();
+    void solidWithTextureCoordsAndCaps();
+    void wireframe();
 };
 
 CylinderTest::CylinderTest() {
diff --git a/src/Magnum/Primitives/Test/IcosphereTest.cpp b/src/Magnum/Primitives/Test/IcosphereTest.cpp
index 2b1c5016e..e9fa0e617 100644
--- a/src/Magnum/Primitives/Test/IcosphereTest.cpp
+++ b/src/Magnum/Primitives/Test/IcosphereTest.cpp
@@ -31,11 +31,10 @@
 
 namespace Magnum { namespace Primitives { namespace Test {
 
-class IcosphereTest: public TestSuite::Tester {
-    public:
-        explicit IcosphereTest();
+struct IcosphereTest: TestSuite::Tester {
+    explicit IcosphereTest();
 
-        void count();
+    void count();
 };
 
 IcosphereTest::IcosphereTest() {
diff --git a/src/Magnum/Primitives/Test/UVSphereTest.cpp b/src/Magnum/Primitives/Test/UVSphereTest.cpp
index 0954d1f07..ac827677c 100644
--- a/src/Magnum/Primitives/Test/UVSphereTest.cpp
+++ b/src/Magnum/Primitives/Test/UVSphereTest.cpp
@@ -32,13 +32,12 @@
 
 namespace Magnum { namespace Primitives { namespace Test {
 
-class UVSphereTest: public TestSuite::Tester {
-    public:
-        UVSphereTest();
+struct UVSphereTest: TestSuite::Tester {
+    explicit UVSphereTest();
 
-        void solidWithoutTextureCoords();
-        void solidWithTextureCoords();
-        void wireframe();
+    void solidWithoutTextureCoords();
+    void solidWithTextureCoords();
+    void wireframe();
 };
 
 UVSphereTest::UVSphereTest() {
diff --git a/src/Magnum/SceneGraph/Test/AnimableTest.cpp b/src/Magnum/SceneGraph/Test/AnimableTest.cpp
index e242bdb10..5d271dcca 100644
--- a/src/Magnum/SceneGraph/Test/AnimableTest.cpp
+++ b/src/Magnum/SceneGraph/Test/AnimableTest.cpp
@@ -32,18 +32,17 @@
 
 namespace Magnum { namespace SceneGraph { namespace Test {
 
-class AnimableTest: public TestSuite::Tester {
-    public:
-        AnimableTest();
+struct AnimableTest: TestSuite::Tester {
+    explicit AnimableTest();
 
-        void state();
-        void step();
-        void duration();
-        void repeat();
-        void stop();
-        void pause();
+    void state();
+    void step();
+    void duration();
+    void repeat();
+    void stop();
+    void pause();
 
-        void debug();
+    void debug();
 };
 
 typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;
diff --git a/src/Magnum/SceneGraph/Test/CameraTest.cpp b/src/Magnum/SceneGraph/Test/CameraTest.cpp
index 22ade3d1b..800fecf43 100644
--- a/src/Magnum/SceneGraph/Test/CameraTest.cpp
+++ b/src/Magnum/SceneGraph/Test/CameraTest.cpp
@@ -35,18 +35,17 @@
 
 namespace Magnum { namespace SceneGraph { namespace Test {
 
-class CameraTest: public TestSuite::Tester {
-    public:
-        CameraTest();
-
-        void fixAspectRatio();
-        void defaultProjection2D();
-        void defaultProjection3D();
-        void projectionSize2D();
-        void projectionSizeOrthographic();
-        void projectionSizePerspective();
-        void projectionSizeViewport();
-        void draw();
+struct CameraTest: TestSuite::Tester {
+    explicit CameraTest();
+
+    void fixAspectRatio();
+    void defaultProjection2D();
+    void defaultProjection3D();
+    void projectionSize2D();
+    void projectionSizeOrthographic();
+    void projectionSizePerspective();
+    void projectionSizeViewport();
+    void draw();
 };
 
 typedef SceneGraph::Object<SceneGraph::MatrixTransformation2D> Object2D;
diff --git a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
index 58a667ae5..0dfacc46b 100644
--- a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
+++ b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp
@@ -34,21 +34,20 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<DualComplexTransformation> Object2D;
 typedef Scene<DualComplexTransformation> Scene2D;
 
-class DualComplexTransformationTest: public TestSuite::Tester {
-    public:
-        explicit DualComplexTransformationTest();
-
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
-
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
-        void rotate();
-        void normalizeRotation();
+struct DualComplexTransformationTest: TestSuite::Tester {
+    explicit DualComplexTransformationTest();
+
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
+
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
+    void rotate();
+    void normalizeRotation();
 };
 
 DualComplexTransformationTest::DualComplexTransformationTest() {
diff --git a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
index b2a6d93f6..35e7101d1 100644
--- a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
+++ b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp
@@ -34,21 +34,20 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<DualQuaternionTransformation> Object3D;
 typedef Scene<DualQuaternionTransformation> Scene3D;
 
-class DualQuaternionTransformationTest: public TestSuite::Tester {
-    public:
-        explicit DualQuaternionTransformationTest();
-
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
-
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
-        void rotate();
-        void normalizeRotation();
+struct DualQuaternionTransformationTest: TestSuite::Tester {
+    explicit DualQuaternionTransformationTest();
+
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
+
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
+    void rotate();
+    void normalizeRotation();
 };
 
 DualQuaternionTransformationTest::DualQuaternionTransformationTest() {
diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
index 6e376e491..fd0ebae72 100644
--- a/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/MatrixTransformation2DTest.cpp
@@ -33,22 +33,21 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<MatrixTransformation2D> Object2D;
 typedef Scene<MatrixTransformation2D> Scene2D;
 
-class MatrixTransformation2DTest: public TestSuite::Tester {
-    public:
-        explicit MatrixTransformation2DTest();
-
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
-
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
-        void rotate();
-        void scale();
-        void reflect();
+struct MatrixTransformation2DTest: TestSuite::Tester {
+    explicit MatrixTransformation2DTest();
+
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
+
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
+    void rotate();
+    void scale();
+    void reflect();
 };
 
 MatrixTransformation2DTest::MatrixTransformation2DTest() {
diff --git a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
index 7c8c012d7..0ccd9c71d 100644
--- a/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/MatrixTransformation3DTest.cpp
@@ -33,22 +33,21 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<MatrixTransformation3D> Object3D;
 typedef Scene<MatrixTransformation3D> Scene3D;
 
-class MatrixTransformation3DTest: public TestSuite::Tester {
-    public:
-        explicit MatrixTransformation3DTest();
-
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
-
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
-        void rotate();
-        void scale();
-        void reflect();
+struct MatrixTransformation3DTest: TestSuite::Tester {
+    explicit MatrixTransformation3DTest();
+
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
+
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
+    void rotate();
+    void scale();
+    void reflect();
 };
 
 MatrixTransformation3DTest::MatrixTransformation3DTest() {
diff --git a/src/Magnum/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp
index b42e3308f..928b21718 100644
--- a/src/Magnum/SceneGraph/Test/ObjectTest.cpp
+++ b/src/Magnum/SceneGraph/Test/ObjectTest.cpp
@@ -31,24 +31,23 @@
 
 namespace Magnum { namespace SceneGraph { namespace Test {
 
-class ObjectTest: public TestSuite::Tester {
-    public:
-        ObjectTest();
-
-        void parenting();
-        void scene();
-        void setParentKeepTransformation();
-        void absoluteTransformation();
-        void transformations();
-        void transformationsRelative();
-        void transformationsOrphan();
-        void transformationsDuplicate();
-        void setClean();
-        void setCleanListHierarchy();
-        void setCleanListBulk();
-
-        void rangeBasedForChildren();
-        void rangeBasedForFeatures();
+struct ObjectTest: TestSuite::Tester {
+    explicit ObjectTest();
+
+    void parenting();
+    void scene();
+    void setParentKeepTransformation();
+    void absoluteTransformation();
+    void transformations();
+    void transformationsRelative();
+    void transformationsOrphan();
+    void transformationsDuplicate();
+    void setClean();
+    void setCleanListHierarchy();
+    void setCleanListBulk();
+
+    void rangeBasedForChildren();
+    void rangeBasedForFeatures();
 };
 
 typedef SceneGraph::Object<SceneGraph::MatrixTransformation3D> Object3D;
diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
index 46d3200eb..8fca0cba9 100644
--- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp
@@ -34,22 +34,21 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<RigidMatrixTransformation2D> Object2D;
 typedef Scene<RigidMatrixTransformation2D> Scene2D;
 
-class RigidMatrixTransformation2DTest: public TestSuite::Tester {
-    public:
-        explicit RigidMatrixTransformation2DTest();
-
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
-
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
-        void rotate();
-        void reflect();
-        void normalizeRotation();
+struct RigidMatrixTransformation2DTest: TestSuite::Tester {
+    explicit RigidMatrixTransformation2DTest();
+
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
+
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
+    void rotate();
+    void reflect();
+    void normalizeRotation();
 };
 
 RigidMatrixTransformation2DTest::RigidMatrixTransformation2DTest() {
diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
index 26437055b..a89758013 100644
--- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
+++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp
@@ -34,22 +34,21 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<RigidMatrixTransformation3D> Object3D;
 typedef Scene<RigidMatrixTransformation3D> Scene3D;
 
-class RigidMatrixTransformation3DTest: public TestSuite::Tester {
-    public:
-        explicit RigidMatrixTransformation3DTest();
-
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
-
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
-        void rotate();
-        void reflect();
-        void normalizeRotation();
+struct RigidMatrixTransformation3DTest: TestSuite::Tester {
+    explicit RigidMatrixTransformation3DTest();
+
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
+
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
+    void rotate();
+    void reflect();
+    void normalizeRotation();
 };
 
 RigidMatrixTransformation3DTest::RigidMatrixTransformation3DTest() {
diff --git a/src/Magnum/SceneGraph/Test/SceneTest.cpp b/src/Magnum/SceneGraph/Test/SceneTest.cpp
index c3998af8f..e646f1ff8 100644
--- a/src/Magnum/SceneGraph/Test/SceneTest.cpp
+++ b/src/Magnum/SceneGraph/Test/SceneTest.cpp
@@ -30,12 +30,11 @@
 
 namespace Magnum { namespace SceneGraph { namespace Test {
 
-class SceneTest: public TestSuite::Tester {
-    public:
-        SceneTest();
+struct SceneTest: TestSuite::Tester {
+    explicit SceneTest();
 
-        void transformation();
-        void parent();
+    void transformation();
+    void parent();
 };
 
 typedef SceneGraph::Scene<SceneGraph::MatrixTransformation3D> Scene3D;
diff --git a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
index 3d30565bf..6d6564ddd 100644
--- a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
+++ b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp
@@ -35,21 +35,20 @@ namespace Magnum { namespace SceneGraph { namespace Test {
 typedef Object<TranslationTransformation2D> Object2D;
 typedef Scene<TranslationTransformation2D> Scene2D;
 
-class TranslationTransformationTest: public TestSuite::Tester {
-    public:
-        explicit TranslationTransformationTest();
+struct TranslationTransformationTest: TestSuite::Tester {
+    explicit TranslationTransformationTest();
 
-        void fromMatrix();
-        void toMatrix();
-        void compose();
-        void inverted();
+    void fromMatrix();
+    void toMatrix();
+    void compose();
+    void inverted();
 
-        void setTransformation();
-        void resetTransformation();
-        void transform();
-        void translate();
+    void setTransformation();
+    void resetTransformation();
+    void transform();
+    void translate();
 
-        void integral();
+    void integral();
 };
 
 TranslationTransformationTest::TranslationTransformationTest() {
diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
index df3e3512f..f658b4835 100644
--- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp
@@ -32,12 +32,11 @@
 
 namespace Magnum { namespace Shaders { namespace Test {
 
-class DistanceFieldVectorGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit DistanceFieldVectorGLTest();
+struct DistanceFieldVectorGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit DistanceFieldVectorGLTest();
 
-        void compile2D();
-        void compile3D();
+    void compile2D();
+    void compile3D();
 };
 
 DistanceFieldVectorGLTest::DistanceFieldVectorGLTest() {
diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp
index 0e2cd1fe1..6b89dfea7 100644
--- a/src/Magnum/Shaders/Test/FlatGLTest.cpp
+++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp
@@ -32,14 +32,13 @@
 
 namespace Magnum { namespace Shaders { namespace Test {
 
-class FlatGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit FlatGLTest();
-
-        void compile2D();
-        void compile3D();
-        void compile2DTextured();
-        void compile3DTextured();
+struct FlatGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit FlatGLTest();
+
+    void compile2D();
+    void compile3D();
+    void compile2DTextured();
+    void compile3DTextured();
 };
 
 FlatGLTest::FlatGLTest() {
diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
index ab74220f1..0ce071067 100644
--- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
+++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
@@ -34,13 +34,12 @@
 
 namespace Magnum { namespace Shaders { namespace Test {
 
-class MeshVisualizerGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit MeshVisualizerGLTest();
+struct MeshVisualizerGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit MeshVisualizerGLTest();
 
-        void compile();
-        void compileWireframeGeometryShader();
-        void compileWireframeNoGeometryShader();
+    void compile();
+    void compileWireframeGeometryShader();
+    void compileWireframeNoGeometryShader();
 };
 
 MeshVisualizerGLTest::MeshVisualizerGLTest() {
diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp
index 2e121f2ad..516c69ad7 100644
--- a/src/Magnum/Shaders/Test/PhongGLTest.cpp
+++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp
@@ -32,18 +32,17 @@
 
 namespace Magnum { namespace Shaders { namespace Test {
 
-class PhongGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit PhongGLTest();
-
-        void compile();
-        void compileAmbientTexture();
-        void compileDiffuseTexture();
-        void compileSpecularTexture();
-        void compileAmbientDiffuseTexture();
-        void compileAmbientSpecularTexture();
-        void compileDiffuseSpecularTexture();
-        void compileAmbientDiffuseSpecularTexture();
+struct PhongGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit PhongGLTest();
+
+    void compile();
+    void compileAmbientTexture();
+    void compileDiffuseTexture();
+    void compileSpecularTexture();
+    void compileAmbientDiffuseTexture();
+    void compileAmbientSpecularTexture();
+    void compileDiffuseSpecularTexture();
+    void compileAmbientDiffuseSpecularTexture();
 };
 
 PhongGLTest::PhongGLTest() {
diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp
index 6e5d4120e..0ca53fd77 100644
--- a/src/Magnum/Shaders/Test/VectorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp
@@ -32,12 +32,11 @@
 
 namespace Magnum { namespace Shaders { namespace Test {
 
-class VectorGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit VectorGLTest();
+struct VectorGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit VectorGLTest();
 
-        void compile2D();
-        void compile3D();
+    void compile2D();
+    void compile3D();
 };
 
 VectorGLTest::VectorGLTest() {
diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
index ca7075158..02e0baae0 100644
--- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
+++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp
@@ -32,12 +32,11 @@
 
 namespace Magnum { namespace Shaders { namespace Test {
 
-class VertexColorGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit VertexColorGLTest();
+struct VertexColorGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit VertexColorGLTest();
 
-        void compile2D();
-        void compile3D();
+    void compile2D();
+    void compile3D();
 };
 
 VertexColorGLTest::VertexColorGLTest() {
diff --git a/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp b/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp
index ec8020f7a..b649dfa62 100644
--- a/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp
+++ b/src/Magnum/Shapes/Test/AxisAlignedBoxTest.cpp
@@ -32,12 +32,11 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class AxisAlignedBoxTest: public TestSuite::Tester {
-    public:
-        AxisAlignedBoxTest();
+struct AxisAlignedBoxTest: TestSuite::Tester {
+    explicit AxisAlignedBoxTest();
 
-        void transformed();
-        void collisionPoint();
+    void transformed();
+    void collisionPoint();
 };
 
 AxisAlignedBoxTest::AxisAlignedBoxTest() {
diff --git a/src/Magnum/Shapes/Test/BoxTest.cpp b/src/Magnum/Shapes/Test/BoxTest.cpp
index 2fddab2b6..19dd194eb 100644
--- a/src/Magnum/Shapes/Test/BoxTest.cpp
+++ b/src/Magnum/Shapes/Test/BoxTest.cpp
@@ -31,11 +31,10 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class BoxTest: public TestSuite::Tester {
-    public:
-        BoxTest();
+struct BoxTest: TestSuite::Tester {
+    explicit BoxTest();
 
-        void transformed();
+    void transformed();
 };
 
 BoxTest::BoxTest() {
diff --git a/src/Magnum/Shapes/Test/CapsuleTest.cpp b/src/Magnum/Shapes/Test/CapsuleTest.cpp
index 7468e09db..845e1f89a 100644
--- a/src/Magnum/Shapes/Test/CapsuleTest.cpp
+++ b/src/Magnum/Shapes/Test/CapsuleTest.cpp
@@ -34,14 +34,13 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class CapsuleTest: public TestSuite::Tester {
-    public:
-        CapsuleTest();
-
-        void transformed();
-        void transformedAverageScaling();
-        void collisionPoint();
-        void collisionSphere();
+struct CapsuleTest: TestSuite::Tester {
+    explicit CapsuleTest();
+
+    void transformed();
+    void transformedAverageScaling();
+    void collisionPoint();
+    void collisionSphere();
 };
 
 CapsuleTest::CapsuleTest() {
diff --git a/src/Magnum/Shapes/Test/CollisionTest.cpp b/src/Magnum/Shapes/Test/CollisionTest.cpp
index 523c76594..06345ecf6 100644
--- a/src/Magnum/Shapes/Test/CollisionTest.cpp
+++ b/src/Magnum/Shapes/Test/CollisionTest.cpp
@@ -30,12 +30,11 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class CollisionTest: public TestSuite::Tester {
-    public:
-        explicit CollisionTest();
+struct CollisionTest: TestSuite::Tester {
+    explicit CollisionTest();
 
-        void boolConversion();
-        void flipped();
+    void boolConversion();
+    void flipped();
 };
 
 CollisionTest::CollisionTest() {
diff --git a/src/Magnum/Shapes/Test/CompositionTest.cpp b/src/Magnum/Shapes/Test/CompositionTest.cpp
index 124b81f05..970f5d257 100644
--- a/src/Magnum/Shapes/Test/CompositionTest.cpp
+++ b/src/Magnum/Shapes/Test/CompositionTest.cpp
@@ -34,20 +34,19 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class CompositionTest: public TestSuite::Tester {
-    public:
-        CompositionTest();
-
-        void negated();
-        void anded();
-        void ored();
-        void multipleUnary();
-        void hierarchy();
-        void empty();
-
-        void copy();
-        void move();
-        void transformed();
+struct CompositionTest: TestSuite::Tester {
+    explicit CompositionTest();
+
+    void negated();
+    void anded();
+    void ored();
+    void multipleUnary();
+    void hierarchy();
+    void empty();
+
+    void copy();
+    void move();
+    void transformed();
 };
 
 CompositionTest::CompositionTest() {
diff --git a/src/Magnum/Shapes/Test/CylinderTest.cpp b/src/Magnum/Shapes/Test/CylinderTest.cpp
index 73b462b6c..d1ad03026 100644
--- a/src/Magnum/Shapes/Test/CylinderTest.cpp
+++ b/src/Magnum/Shapes/Test/CylinderTest.cpp
@@ -34,14 +34,13 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class CylinderTest: public TestSuite::Tester {
-    public:
-        CylinderTest();
-
-        void transformed();
-        void transformedAverageScaling();
-        void collisionPoint();
-        void collisionSphere();
+struct CylinderTest: TestSuite::Tester {
+    explicit CylinderTest();
+
+    void transformed();
+    void transformedAverageScaling();
+    void collisionPoint();
+    void collisionSphere();
 };
 
 CylinderTest::CylinderTest() {
diff --git a/src/Magnum/Shapes/Test/LineTest.cpp b/src/Magnum/Shapes/Test/LineTest.cpp
index 2a56ebc6d..9006ff14f 100644
--- a/src/Magnum/Shapes/Test/LineTest.cpp
+++ b/src/Magnum/Shapes/Test/LineTest.cpp
@@ -31,11 +31,10 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class LineTest: public TestSuite::Tester {
-    public:
-        LineTest();
+struct LineTest: TestSuite::Tester {
+    explicit LineTest();
 
-        void transformed();
+    void transformed();
 };
 
 LineTest::LineTest() {
diff --git a/src/Magnum/Shapes/Test/PlaneTest.cpp b/src/Magnum/Shapes/Test/PlaneTest.cpp
index c78bb0131..c251384cb 100644
--- a/src/Magnum/Shapes/Test/PlaneTest.cpp
+++ b/src/Magnum/Shapes/Test/PlaneTest.cpp
@@ -32,13 +32,12 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class PlaneTest: public TestSuite::Tester {
-    public:
-        PlaneTest();
+struct PlaneTest: TestSuite::Tester {
+    explicit PlaneTest();
 
-        void transformed();
-        void collisionLine();
-        void collisionLineSegment();
+    void transformed();
+    void collisionLine();
+    void collisionLineSegment();
 };
 
 PlaneTest::PlaneTest() {
diff --git a/src/Magnum/Shapes/Test/PointTest.cpp b/src/Magnum/Shapes/Test/PointTest.cpp
index 55f9b8f3e..8e0fd27e6 100644
--- a/src/Magnum/Shapes/Test/PointTest.cpp
+++ b/src/Magnum/Shapes/Test/PointTest.cpp
@@ -31,11 +31,10 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class PointTest: public TestSuite::Tester {
-    public:
-        PointTest();
+struct PointTest: TestSuite::Tester {
+    explicit PointTest();
 
-        void transformed();
+    void transformed();
 };
 
 PointTest::PointTest() {
diff --git a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
index 496f1b4bc..6b3c62599 100644
--- a/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
+++ b/src/Magnum/Shapes/Test/ShapeImplementationTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class ShapeImplementationTest: public TestSuite::Tester {
-    public:
-        ShapeImplementationTest();
+struct ShapeImplementationTest: TestSuite::Tester {
+    explicit ShapeImplementationTest();
 
-        void debug();
+    void debug();
 };
 
 ShapeImplementationTest::ShapeImplementationTest() {
diff --git a/src/Magnum/Shapes/Test/ShapeTest.cpp b/src/Magnum/Shapes/Test/ShapeTest.cpp
index 5b0849e40..0830dacc0 100644
--- a/src/Magnum/Shapes/Test/ShapeTest.cpp
+++ b/src/Magnum/Shapes/Test/ShapeTest.cpp
@@ -36,15 +36,14 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class ShapeTest: public TestSuite::Tester {
-    public:
-        ShapeTest();
-
-        void clean();
-        void collides();
-        void collision();
-        void firstCollision();
-        void shapeGroup();
+struct ShapeTest: TestSuite::Tester {
+    explicit ShapeTest();
+
+    void clean();
+    void collides();
+    void collision();
+    void firstCollision();
+    void shapeGroup();
 };
 
 typedef SceneGraph::Scene<SceneGraph::MatrixTransformation2D> Scene2D;
diff --git a/src/Magnum/Shapes/Test/SphereTest.cpp b/src/Magnum/Shapes/Test/SphereTest.cpp
index a37e68e62..7096b95d4 100644
--- a/src/Magnum/Shapes/Test/SphereTest.cpp
+++ b/src/Magnum/Shapes/Test/SphereTest.cpp
@@ -34,17 +34,16 @@
 
 namespace Magnum { namespace Shapes { namespace Test {
 
-class SphereTest: public TestSuite::Tester {
-    public:
-        SphereTest();
-
-        void transformed();
-        void collisionPoint();
-        void collisionPointInverted();
-        void collisionLine();
-        void collisionLineSegment();
-        void collisionSphere();
-        void collisionSphereInverted();
+struct SphereTest: TestSuite::Tester {
+    explicit SphereTest();
+
+    void transformed();
+    void collisionPoint();
+    void collisionPointInverted();
+    void collisionLine();
+    void collisionLineSegment();
+    void collisionSphere();
+    void collisionSphereInverted();
 };
 
 SphereTest::SphereTest() {
diff --git a/src/Magnum/Test/AbstractImageTest.cpp b/src/Magnum/Test/AbstractImageTest.cpp
index f49ce47c6..39c0a0300 100644
--- a/src/Magnum/Test/AbstractImageTest.cpp
+++ b/src/Magnum/Test/AbstractImageTest.cpp
@@ -32,15 +32,14 @@
 
 namespace Magnum { namespace Test {
 
-class AbstractImageTest: public TestSuite::Tester {
-    public:
-        explicit AbstractImageTest();
+struct AbstractImageTest: TestSuite::Tester {
+    explicit AbstractImageTest();
 
-        void pixelSize();
-        void dataSize();
+    void pixelSize();
+    void dataSize();
 
-        void debugFormat();
-        void debugType();
+    void debugFormat();
+    void debugType();
 };
 
 AbstractImageTest::AbstractImageTest() {
diff --git a/src/Magnum/Test/AbstractObjectGLTest.cpp b/src/Magnum/Test/AbstractObjectGLTest.cpp
index dba9025ce..21649eb44 100644
--- a/src/Magnum/Test/AbstractObjectGLTest.cpp
+++ b/src/Magnum/Test/AbstractObjectGLTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Test {
 
-class AbstractObjectGLTest: public AbstractOpenGLTester {
-    public:
-        explicit AbstractObjectGLTest();
+struct AbstractObjectGLTest: AbstractOpenGLTester {
+    explicit AbstractObjectGLTest();
 
-        void labelNoOp();
+    void labelNoOp();
 };
 
 AbstractObjectGLTest::AbstractObjectGLTest() {
diff --git a/src/Magnum/Test/AbstractQueryGLTest.cpp b/src/Magnum/Test/AbstractQueryGLTest.cpp
index 354cc6cc8..a433899b2 100644
--- a/src/Magnum/Test/AbstractQueryGLTest.cpp
+++ b/src/Magnum/Test/AbstractQueryGLTest.cpp
@@ -28,15 +28,14 @@
 
 namespace Magnum { namespace Test {
 
-class AbstractQueryGLTest: public AbstractOpenGLTester {
-    public:
-        explicit AbstractQueryGLTest();
+struct AbstractQueryGLTest: AbstractOpenGLTester {
+    explicit AbstractQueryGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 };
 
 AbstractQueryGLTest::AbstractQueryGLTest() {
diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
index c91bddc02..12638accc 100644
--- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
+++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
@@ -35,26 +35,25 @@
 
 namespace Magnum { namespace Test {
 
-class AbstractShaderProgramGLTest: public AbstractOpenGLTester {
-    public:
-        explicit AbstractShaderProgramGLTest();
+struct AbstractShaderProgramGLTest: AbstractOpenGLTester {
+    explicit AbstractShaderProgramGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 
-        void create();
-        void createMultipleOutputs();
-        #ifndef MAGNUM_TARGET_GLES
-        void createMultipleOutputsIndexed();
-        #endif
+    void create();
+    void createMultipleOutputs();
+    #ifndef MAGNUM_TARGET_GLES
+    void createMultipleOutputsIndexed();
+    #endif
 
-        void uniform();
-        void uniformVector();
-        void uniformMatrix();
-        void uniformArray();
+    void uniform();
+    void uniformVector();
+    void uniformMatrix();
+    void uniformArray();
 };
 
 AbstractShaderProgramGLTest::AbstractShaderProgramGLTest() {
diff --git a/src/Magnum/Test/AbstractShaderProgramTest.cpp b/src/Magnum/Test/AbstractShaderProgramTest.cpp
index 6319694f5..bdcd6bd0a 100644
--- a/src/Magnum/Test/AbstractShaderProgramTest.cpp
+++ b/src/Magnum/Test/AbstractShaderProgramTest.cpp
@@ -29,28 +29,27 @@
 
 namespace Magnum { namespace Test {
 
-class AbstractShaderProgramTest: public TestSuite::Tester {
-    public:
-        explicit AbstractShaderProgramTest();
-
-        void attributeScalar();
-        void attributeScalarInt();
-        void attributeScalarUnsignedInt();
-        void attributeScalarDouble();
-
-        void attributeVector();
-        void attributeVectorInt();
-        void attributeVectorUnsignedInt();
-        void attributeVectorDouble();
-        void attributeVector4();
-        void attributeVectorBGRA();
-
-        void attributeMatrixNxN();
-        #ifndef MAGNUM_TARGET_GLES2
-        void attributeMatrixMxN();
-        #endif
-        void attributeMatrixNxNd();
-        void attributeMatrixMxNd();
+struct AbstractShaderProgramTest: TestSuite::Tester {
+    explicit AbstractShaderProgramTest();
+
+    void attributeScalar();
+    void attributeScalarInt();
+    void attributeScalarUnsignedInt();
+    void attributeScalarDouble();
+
+    void attributeVector();
+    void attributeVectorInt();
+    void attributeVectorUnsignedInt();
+    void attributeVectorDouble();
+    void attributeVector4();
+    void attributeVectorBGRA();
+
+    void attributeMatrixNxN();
+    #ifndef MAGNUM_TARGET_GLES2
+    void attributeMatrixMxN();
+    #endif
+    void attributeMatrixNxNd();
+    void attributeMatrixMxNd();
 };
 
 AbstractShaderProgramTest::AbstractShaderProgramTest() {
diff --git a/src/Magnum/Test/AbstractTextureGLTest.cpp b/src/Magnum/Test/AbstractTextureGLTest.cpp
index 8eb0c42cf..dd04a2c38 100644
--- a/src/Magnum/Test/AbstractTextureGLTest.cpp
+++ b/src/Magnum/Test/AbstractTextureGLTest.cpp
@@ -30,15 +30,14 @@
 
 namespace Magnum { namespace Test {
 
-class AbstractTextureGLTest: public AbstractOpenGLTester {
-    public:
-        explicit AbstractTextureGLTest();
+struct AbstractTextureGLTest: AbstractOpenGLTester {
+    explicit AbstractTextureGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 };
 
 AbstractTextureGLTest::AbstractTextureGLTest() {
diff --git a/src/Magnum/Test/ArrayTest.cpp b/src/Magnum/Test/ArrayTest.cpp
index c12db9c5a..70a88c4e8 100644
--- a/src/Magnum/Test/ArrayTest.cpp
+++ b/src/Magnum/Test/ArrayTest.cpp
@@ -29,13 +29,12 @@
 
 namespace Magnum { namespace Test {
 
-class ArrayTest: public TestSuite::Tester {
-    public:
-        ArrayTest();
+struct ArrayTest: TestSuite::Tester {
+    explicit ArrayTest();
 
-        void construct();
-        void equality();
-        void access();
+    void construct();
+    void equality();
+    void access();
 };
 
 typedef Magnum::Array1D<Int> Array1D;
diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp
index 27f90d3da..07d4f944d 100644
--- a/src/Magnum/Test/BufferGLTest.cpp
+++ b/src/Magnum/Test/BufferGLTest.cpp
@@ -34,32 +34,31 @@
 
 namespace Magnum { namespace Test {
 
-class BufferGLTest: public AbstractOpenGLTester {
-    public:
-        explicit BufferGLTest();
-
-        void construct();
-        void constructCopy();
-        void constructMove();
-
-        void label();
-
-        #ifndef MAGNUM_TARGET_GLES2
-        void bindBase();
-        void bindRange();
-        #endif
-
-        void data();
-        void map();
-        #ifdef MAGNUM_TARGET_GLES2
-        void mapSub();
-        #endif
-        void mapRange();
-        void mapRangeExplicitFlush();
-        #ifndef MAGNUM_TARGET_GLES2
-        void copy();
-        #endif
-        void invalidate();
+struct BufferGLTest: AbstractOpenGLTester {
+    explicit BufferGLTest();
+
+    void construct();
+    void constructCopy();
+    void constructMove();
+
+    void label();
+
+    #ifndef MAGNUM_TARGET_GLES2
+    void bindBase();
+    void bindRange();
+    #endif
+
+    void data();
+    void map();
+    #ifdef MAGNUM_TARGET_GLES2
+    void mapSub();
+    #endif
+    void mapRange();
+    void mapRangeExplicitFlush();
+    #ifndef MAGNUM_TARGET_GLES2
+    void copy();
+    #endif
+    void invalidate();
 };
 
 BufferGLTest::BufferGLTest() {
diff --git a/src/Magnum/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp
index 5dea7d998..e982d1c57 100644
--- a/src/Magnum/Test/BufferImageGLTest.cpp
+++ b/src/Magnum/Test/BufferImageGLTest.cpp
@@ -31,15 +31,14 @@
 
 namespace Magnum { namespace Test {
 
-class BufferImageTest: public AbstractOpenGLTester {
-    public:
-        explicit BufferImageTest();
+struct BufferImageTest: AbstractOpenGLTester {
+    explicit BufferImageTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void setData();
+    void setData();
 };
 
 BufferImageTest::BufferImageTest() {
diff --git a/src/Magnum/Test/BufferTextureGLTest.cpp b/src/Magnum/Test/BufferTextureGLTest.cpp
index 78c092bbd..93f9909c9 100644
--- a/src/Magnum/Test/BufferTextureGLTest.cpp
+++ b/src/Magnum/Test/BufferTextureGLTest.cpp
@@ -31,14 +31,13 @@
 
 namespace Magnum { namespace Test {
 
-class BufferTextureGLTest: public AbstractOpenGLTester {
-    public:
-        explicit BufferTextureGLTest();
-
-        void construct();
-        void bind();
-        void setBuffer();
-        void setBufferOffset();
+struct BufferTextureGLTest: AbstractOpenGLTester {
+    explicit BufferTextureGLTest();
+
+    void construct();
+    void bind();
+    void setBuffer();
+    void setBufferOffset();
 };
 
 BufferTextureGLTest::BufferTextureGLTest() {
diff --git a/src/Magnum/Test/ColorTest.cpp b/src/Magnum/Test/ColorTest.cpp
index f1e3a7b61..9a1bf9347 100644
--- a/src/Magnum/Test/ColorTest.cpp
+++ b/src/Magnum/Test/ColorTest.cpp
@@ -31,35 +31,34 @@
 
 namespace Magnum { namespace Test {
 
-class ColorTest: public TestSuite::Tester {
-    public:
-        ColorTest();
-
-        void construct();
-        void constructDefault();
-        void constructOneValue();
-        void constructParts();
-        void constructConversion();
-        void constructNormalization();
-        void constructCopy();
-
-        void colors();
-
-        void fromHue();
-        void fromSaturation();
-        void fromValue();
-
-        void hue();
-        void saturation();
-        void value();
-
-        void hsv();
-        void hsvOverflow();
-        void hsvAlpha();
-
-        void swizzleType();
-        void debug();
-        void configuration();
+struct ColorTest: TestSuite::Tester {
+    explicit ColorTest();
+
+    void construct();
+    void constructDefault();
+    void constructOneValue();
+    void constructParts();
+    void constructConversion();
+    void constructNormalization();
+    void constructCopy();
+
+    void colors();
+
+    void fromHue();
+    void fromSaturation();
+    void fromValue();
+
+    void hue();
+    void saturation();
+    void value();
+
+    void hsv();
+    void hsvOverflow();
+    void hsvAlpha();
+
+    void swizzleType();
+    void debug();
+    void configuration();
 };
 
 ColorTest::ColorTest() {
diff --git a/src/Magnum/Test/ContextGLTest.cpp b/src/Magnum/Test/ContextGLTest.cpp
index 021abefed..0b5a29708 100644
--- a/src/Magnum/Test/ContextGLTest.cpp
+++ b/src/Magnum/Test/ContextGLTest.cpp
@@ -29,14 +29,13 @@
 
 namespace Magnum { namespace Test {
 
-class ContextGLTest: public AbstractOpenGLTester {
-    public:
-        explicit ContextGLTest();
-
-        void isVersionSupported();
-        void supportedVersion();
-        void isExtensionSupported();
-        void isExtensionDisabled();
+struct ContextGLTest: AbstractOpenGLTester {
+    explicit ContextGLTest();
+
+    void isVersionSupported();
+    void supportedVersion();
+    void isExtensionSupported();
+    void isExtensionDisabled();
 };
 
 ContextGLTest::ContextGLTest() {
diff --git a/src/Magnum/Test/ContextTest.cpp b/src/Magnum/Test/ContextTest.cpp
index c14ad4007..fab4650df 100644
--- a/src/Magnum/Test/ContextTest.cpp
+++ b/src/Magnum/Test/ContextTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Test {
 
-class ContextTest: public TestSuite::Tester {
-    public:
-        explicit ContextTest();
+struct ContextTest: TestSuite::Tester {
+    explicit ContextTest();
 
-        void debugFlag();
+    void debugFlag();
 };
 
 ContextTest::ContextTest() {
diff --git a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
index 4e083c335..ee84c9611 100644
--- a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
+++ b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
@@ -35,30 +35,29 @@
 
 namespace Magnum { namespace Test {
 
-class CubeMapTextureArrayGLTest: public AbstractOpenGLTester {
-    public:
-        explicit CubeMapTextureArrayGLTest();
+struct CubeMapTextureArrayGLTest: AbstractOpenGLTester {
+    explicit CubeMapTextureArrayGLTest();
 
-        void construct();
-        void bind();
+    void construct();
+    void bind();
 
-        void sampling();
-        void samplingSRGBDecode();
-        void samplingBorderInteger();
-        void samplingSwizzle();
-        void samplingDepthStencilMode();
+    void sampling();
+    void samplingSRGBDecode();
+    void samplingBorderInteger();
+    void samplingSwizzle();
+    void samplingDepthStencilMode();
 
-        void storage();
+    void storage();
 
-        void image();
-        void imageBuffer();
-        void subImage();
-        void subImageBuffer();
+    void image();
+    void imageBuffer();
+    void subImage();
+    void subImageBuffer();
 
-        void generateMipmap();
+    void generateMipmap();
 
-        void invalidateImage();
-        void invalidateSubImage();
+    void invalidateImage();
+    void invalidateSubImage();
 };
 
 CubeMapTextureArrayGLTest::CubeMapTextureArrayGLTest() {
diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp
index 690bfeb17..e7e646fd2 100644
--- a/src/Magnum/Test/CubeMapTextureGLTest.cpp
+++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp
@@ -38,44 +38,43 @@
 
 namespace Magnum { namespace Test {
 
-class CubeMapTextureGLTest: public AbstractOpenGLTester {
-    public:
-        explicit CubeMapTextureGLTest();
-
-        void construct();
-        void bind();
-
-        void sampling();
-        void samplingSRGBDecode();
-        #ifndef MAGNUM_TARGET_GLES2
-        void samplingSwizzle();
-        #else
-        void samplingMaxLevel();
-        void samplingCompare();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingBorderInteger();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void samplingDepthStencilMode();
-        #endif
-
-        void storage();
-
-        void image();
-        #ifndef MAGNUM_TARGET_GLES2
-        void imageBuffer();
-        #endif
-
-        void subImage();
-        #ifndef MAGNUM_TARGET_GLES2
-        void subImageBuffer();
-        #endif
-
-        void generateMipmap();
-
-        void invalidateImage();
-        void invalidateSubImage();
+struct CubeMapTextureGLTest: AbstractOpenGLTester {
+    explicit CubeMapTextureGLTest();
+
+    void construct();
+    void bind();
+
+    void sampling();
+    void samplingSRGBDecode();
+    #ifndef MAGNUM_TARGET_GLES2
+    void samplingSwizzle();
+    #else
+    void samplingMaxLevel();
+    void samplingCompare();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingBorderInteger();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void samplingDepthStencilMode();
+    #endif
+
+    void storage();
+
+    void image();
+    #ifndef MAGNUM_TARGET_GLES2
+    void imageBuffer();
+    #endif
+
+    void subImage();
+    #ifndef MAGNUM_TARGET_GLES2
+    void subImageBuffer();
+    #endif
+
+    void generateMipmap();
+
+    void invalidateImage();
+    void invalidateSubImage();
 };
 
 CubeMapTextureGLTest::CubeMapTextureGLTest() {
diff --git a/src/Magnum/Test/DebugGLTest.cpp b/src/Magnum/Test/DebugGLTest.cpp
index 8e7b3e9a7..3cc798ebc 100644
--- a/src/Magnum/Test/DebugGLTest.cpp
+++ b/src/Magnum/Test/DebugGLTest.cpp
@@ -36,17 +36,16 @@
 
 namespace Magnum { namespace Test {
 
-class DebugGLTest: public AbstractOpenGLTester {
-    public:
-        explicit DebugGLTest();
+struct DebugGLTest: AbstractOpenGLTester {
+    explicit DebugGLTest();
 
-        void insertMessageNoOp();
-        void insertMessage();
-        void insertMessageFallback();
+    void insertMessageNoOp();
+    void insertMessage();
+    void insertMessageFallback();
 
-        void setMessageEnabled();
+    void setMessageEnabled();
 
-        void deprecated();
+    void deprecated();
 };
 
 DebugGLTest::DebugGLTest() {
diff --git a/src/Magnum/Test/DebugMessageTest.cpp b/src/Magnum/Test/DebugMessageTest.cpp
index da83716fb..f0854b548 100644
--- a/src/Magnum/Test/DebugMessageTest.cpp
+++ b/src/Magnum/Test/DebugMessageTest.cpp
@@ -30,13 +30,12 @@
 
 namespace Magnum { namespace Test {
 
-class DebugMessageTest: public TestSuite::Tester {
-    public:
-        explicit DebugMessageTest();
+struct DebugMessageTest: TestSuite::Tester {
+    explicit DebugMessageTest();
 
-        void debugSource();
-        void debugType();
-        void debugSeverity();
+    void debugSource();
+    void debugType();
+    void debugSeverity();
 };
 
 DebugMessageTest::DebugMessageTest() {
diff --git a/src/Magnum/Test/DefaultFramebufferTest.cpp b/src/Magnum/Test/DefaultFramebufferTest.cpp
index 0ecb566d9..6121a2f1d 100644
--- a/src/Magnum/Test/DefaultFramebufferTest.cpp
+++ b/src/Magnum/Test/DefaultFramebufferTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Test {
 
-class DefaultFramebufferTest: public TestSuite::Tester {
-    public:
-        explicit DefaultFramebufferTest();
+struct DefaultFramebufferTest: TestSuite::Tester {
+    explicit DefaultFramebufferTest();
 
-        void debugStatus();
+    void debugStatus();
 };
 
 DefaultFramebufferTest::DefaultFramebufferTest() {
diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp
index b709b2a9d..12debe34d 100644
--- a/src/Magnum/Test/FramebufferGLTest.cpp
+++ b/src/Magnum/Test/FramebufferGLTest.cpp
@@ -49,52 +49,51 @@
 
 namespace Magnum { namespace Test {
 
-class FramebufferGLTest: public AbstractOpenGLTester {
-    public:
-        explicit FramebufferGLTest();
+struct FramebufferGLTest: AbstractOpenGLTester {
+    explicit FramebufferGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 
-        void attachRenderbuffer();
-        void attachRenderbufferMultisample();
+    void attachRenderbuffer();
+    void attachRenderbufferMultisample();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void attachTexture1D();
-        #endif
-        void attachTexture2D();
-        void attachTexture3D();
-        #ifndef MAGNUM_TARGET_GLES
-        void attachTexture1DArray();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void attachTexture2DArray();
-        void attachTexture2DMultisample();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES
-        void attachTexture2DMultisampleArray();
-        void attachRectangleTexture();
-        #endif
-        void attachCubeMapTexture();
-        #ifndef MAGNUM_TARGET_GLES
-        void attachCubeMapTextureArray();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void attachTexture1D();
+    #endif
+    void attachTexture2D();
+    void attachTexture3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void attachTexture1DArray();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void attachTexture2DArray();
+    void attachTexture2DMultisample();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void attachTexture2DMultisampleArray();
+    void attachRectangleTexture();
+    #endif
+    void attachCubeMapTexture();
+    #ifndef MAGNUM_TARGET_GLES
+    void attachCubeMapTextureArray();
+    #endif
 
-        void multipleColorOutputs();
+    void multipleColorOutputs();
 
-        void clear();
-        void invalidate();
-        #ifndef MAGNUM_TARGET_GLES2
-        void invalidateSub();
-        #endif
-        void read();
-        #ifndef MAGNUM_TARGET_GLES2
-        void readBuffer();
-        #endif
-        void blit();
+    void clear();
+    void invalidate();
+    #ifndef MAGNUM_TARGET_GLES2
+    void invalidateSub();
+    #endif
+    void read();
+    #ifndef MAGNUM_TARGET_GLES2
+    void readBuffer();
+    #endif
+    void blit();
 
     #ifdef MAGNUM_TARGET_GLES2
     private:
diff --git a/src/Magnum/Test/FramebufferTest.cpp b/src/Magnum/Test/FramebufferTest.cpp
index c41a61b14..de85126d9 100644
--- a/src/Magnum/Test/FramebufferTest.cpp
+++ b/src/Magnum/Test/FramebufferTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Test {
 
-class FramebufferTest: public TestSuite::Tester {
-    public:
-        explicit FramebufferTest();
+struct FramebufferTest: TestSuite::Tester {
+    explicit FramebufferTest();
 
-        void debugStatus();
+    void debugStatus();
 };
 
 FramebufferTest::FramebufferTest() {
diff --git a/src/Magnum/Test/ImageReferenceTest.cpp b/src/Magnum/Test/ImageReferenceTest.cpp
index c746693ae..6ec60ac03 100644
--- a/src/Magnum/Test/ImageReferenceTest.cpp
+++ b/src/Magnum/Test/ImageReferenceTest.cpp
@@ -30,12 +30,11 @@
 
 namespace Magnum { namespace Test {
 
-class ImageReferenceTest: public TestSuite::Tester {
-    public:
-        explicit ImageReferenceTest();
+struct ImageReferenceTest: TestSuite::Tester {
+    explicit ImageReferenceTest();
 
-        void construct();
-        void setData();
+    void construct();
+    void setData();
 };
 
 ImageReferenceTest::ImageReferenceTest() {
diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp
index d79ae6d9b..b08275c76 100644
--- a/src/Magnum/Test/ImageTest.cpp
+++ b/src/Magnum/Test/ImageTest.cpp
@@ -30,17 +30,16 @@
 
 namespace Magnum { namespace Test {
 
-class ImageTest: public TestSuite::Tester {
-    public:
-        explicit ImageTest();
+struct ImageTest: TestSuite::Tester {
+    explicit ImageTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void setData();
-        void toReference();
-        void release();
+    void setData();
+    void toReference();
+    void release();
 };
 
 ImageTest::ImageTest() {
diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp
index 7b13199dc..a9d88d762 100644
--- a/src/Magnum/Test/MeshGLTest.cpp
+++ b/src/Magnum/Test/MeshGLTest.cpp
@@ -42,98 +42,97 @@ namespace Magnum { namespace Test {
 
 /* Tests also MeshView class. */
 
-class MeshGLTest: public AbstractOpenGLTester {
-    public:
-        explicit MeshGLTest();
+struct MeshGLTest: AbstractOpenGLTester {
+    explicit MeshGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 
-        #ifndef MAGNUM_TARGET_GLES2
-        void addVertexBufferUnsignedInt();
-        void addVertexBufferInt();
-        #endif
-        void addVertexBufferFloat();
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferDouble();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void addVertexBufferVectorNui();
-        void addVertexBufferVectorNi();
-        #endif
-        void addVertexBufferVectorN();
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferVectorNd();
-        #endif
-        void addVertexBufferMatrixNxN();
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferMatrixNxNd();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void addVertexBufferMatrixMxN();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferMatrixMxNd();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void addVertexBufferUnsignedInt();
+    void addVertexBufferInt();
+    #endif
+    void addVertexBufferFloat();
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferDouble();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void addVertexBufferVectorNui();
+    void addVertexBufferVectorNi();
+    #endif
+    void addVertexBufferVectorN();
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferVectorNd();
+    #endif
+    void addVertexBufferMatrixNxN();
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferMatrixNxNd();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void addVertexBufferMatrixMxN();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferMatrixMxNd();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES2
-        void addVertexBufferUnsignedIntWithUnsignedShort();
-        void addVertexBufferUnsignedIntWithShort();
-        void addVertexBufferIntWithUnsignedShort();
-        void addVertexBufferIntWithShort();
-        #endif
-        /* Other Float types omitted (covered by addVertexBufferNormalized()) */
-        void addVertexBufferFloatWithHalfFloat();
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferFloatWithDouble();
-        void addVertexBufferVector3WithUnsignedInt10f11f11fRev();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void addVertexBufferVector4WithUnsignedInt2101010Rev();
-        void addVertexBufferVector4WithInt2101010Rev();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void addVertexBufferUnsignedIntWithUnsignedShort();
+    void addVertexBufferUnsignedIntWithShort();
+    void addVertexBufferIntWithUnsignedShort();
+    void addVertexBufferIntWithShort();
+    #endif
+    /* Other Float types omitted (covered by addVertexBufferNormalized()) */
+    void addVertexBufferFloatWithHalfFloat();
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferFloatWithDouble();
+    void addVertexBufferVector3WithUnsignedInt10f11f11fRev();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void addVertexBufferVector4WithUnsignedInt2101010Rev();
+    void addVertexBufferVector4WithInt2101010Rev();
+    #endif
 
-        void addVertexBufferLessVectorComponents();
-        void addVertexBufferNormalized();
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferBGRA();
-        #endif
+    void addVertexBufferLessVectorComponents();
+    void addVertexBufferNormalized();
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferBGRA();
+    #endif
 
-        void addVertexBufferMultiple();
-        void addVertexBufferMultipleGaps();
+    void addVertexBufferMultiple();
+    void addVertexBufferMultipleGaps();
 
-        void setIndexBuffer();
-        void setIndexBufferRange();
-        void setIndexBufferUnsignedInt();
+    void setIndexBuffer();
+    void setIndexBufferRange();
+    void setIndexBufferUnsignedInt();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void setBaseVertex();
-        #endif
-        void setInstanceCount();
-        void setInstanceCountIndexed();
-        #ifndef MAGNUM_TARGET_GLES
-        void setInstanceCountBaseInstance();
-        void setInstanceCountBaseInstanceIndexed();
-        void setInstanceCountBaseVertex();
-        void setInstanceCountBaseVertexBaseInstance();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void setBaseVertex();
+    #endif
+    void setInstanceCount();
+    void setInstanceCountIndexed();
+    #ifndef MAGNUM_TARGET_GLES
+    void setInstanceCountBaseInstance();
+    void setInstanceCountBaseInstanceIndexed();
+    void setInstanceCountBaseVertex();
+    void setInstanceCountBaseVertexBaseInstance();
+    #endif
 
-        void addVertexBufferInstancedFloat();
-        #ifndef MAGNUM_TARGET_GLES2
-        void addVertexBufferInstancedInteger();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES
-        void addVertexBufferInstancedDouble();
-        #endif
+    void addVertexBufferInstancedFloat();
+    #ifndef MAGNUM_TARGET_GLES2
+    void addVertexBufferInstancedInteger();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void addVertexBufferInstancedDouble();
+    #endif
 
-        void multiDraw();
-        void multiDrawIndexed();
-        #ifndef MAGNUM_TARGET_GLES
-        void multiDrawBaseVertex();
-        #endif
+    void multiDraw();
+    void multiDrawIndexed();
+    #ifndef MAGNUM_TARGET_GLES
+    void multiDrawBaseVertex();
+    #endif
 };
 
 MeshGLTest::MeshGLTest() {
diff --git a/src/Magnum/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp
index 3d6c02870..1994bf894 100644
--- a/src/Magnum/Test/MeshTest.cpp
+++ b/src/Magnum/Test/MeshTest.cpp
@@ -31,16 +31,15 @@
 
 namespace Magnum { namespace Test {
 
-class MeshTest: public TestSuite::Tester {
-    public:
-        MeshTest();
+struct MeshTest: TestSuite::Tester {
+    explicit MeshTest();
 
-        void indexSize();
+    void indexSize();
 
-        void debugPrimitive();
-        void debugIndexType();
-        void configurationPrimitive();
-        void configurationIndexType();
+    void debugPrimitive();
+    void debugIndexType();
+    void configurationPrimitive();
+    void configurationIndexType();
 };
 
 MeshTest::MeshTest() {
diff --git a/src/Magnum/Test/MultisampleTextureGLTest.cpp b/src/Magnum/Test/MultisampleTextureGLTest.cpp
index 3c7fdc9f1..2c5c3c1da 100644
--- a/src/Magnum/Test/MultisampleTextureGLTest.cpp
+++ b/src/Magnum/Test/MultisampleTextureGLTest.cpp
@@ -32,34 +32,33 @@
 
 namespace Magnum { namespace Test {
 
-class MultisampleTextureGLTest: public AbstractOpenGLTester {
-    public:
-        explicit MultisampleTextureGLTest();
-
-        void construct2D();
-        #ifndef MAGNUM_TARGET_GLES
-        void construct2DArray();
-        #endif
-
-        void bind2D();
-        #ifndef MAGNUM_TARGET_GLES
-        void bind2DArray();
-        #endif
-
-        void storage2D();
-        #ifndef MAGNUM_TARGET_GLES
-        void storage2DArray();
-        #endif
-
-        void invalidateImage2D();
-        #ifndef MAGNUM_TARGET_GLES
-        void invalidateImage2DArray();
-        #endif
-
-        void invalidateSubImage2D();
-        #ifndef MAGNUM_TARGET_GLES
-        void invalidateSubImage2DArray();
-        #endif
+struct MultisampleTextureGLTest: AbstractOpenGLTester {
+    explicit MultisampleTextureGLTest();
+
+    void construct2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void construct2DArray();
+    #endif
+
+    void bind2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void bind2DArray();
+    #endif
+
+    void storage2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void storage2DArray();
+    #endif
+
+    void invalidateImage2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void invalidateImage2DArray();
+    #endif
+
+    void invalidateSubImage2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void invalidateSubImage2DArray();
+    #endif
 };
 
 MultisampleTextureGLTest::MultisampleTextureGLTest() {
diff --git a/src/Magnum/Test/PrimitiveQueryGLTest.cpp b/src/Magnum/Test/PrimitiveQueryGLTest.cpp
index b553dc04d..7b3f45d7e 100644
--- a/src/Magnum/Test/PrimitiveQueryGLTest.cpp
+++ b/src/Magnum/Test/PrimitiveQueryGLTest.cpp
@@ -37,14 +37,13 @@
 
 namespace Magnum { namespace Test {
 
-class PrimitiveQueryGLTest: public AbstractOpenGLTester {
-    public:
-        explicit PrimitiveQueryGLTest();
-
-        #ifndef MAGNUM_TARGET_GLES
-        void primitivesGenerated();
-        #endif
-        void transformFeedbackPrimitivesWritten();
+struct PrimitiveQueryGLTest: AbstractOpenGLTester {
+    explicit PrimitiveQueryGLTest();
+
+    #ifndef MAGNUM_TARGET_GLES
+    void primitivesGenerated();
+    #endif
+    void transformFeedbackPrimitivesWritten();
 };
 
 PrimitiveQueryGLTest::PrimitiveQueryGLTest() {
diff --git a/src/Magnum/Test/RectangleTextureGLTest.cpp b/src/Magnum/Test/RectangleTextureGLTest.cpp
index 79d3f6861..88b1e926e 100644
--- a/src/Magnum/Test/RectangleTextureGLTest.cpp
+++ b/src/Magnum/Test/RectangleTextureGLTest.cpp
@@ -36,28 +36,27 @@
 
 namespace Magnum { namespace Test {
 
-class RectangleTextureGLTest: public AbstractOpenGLTester {
-    public:
-        explicit RectangleTextureGLTest();
+struct RectangleTextureGLTest: AbstractOpenGLTester {
+    explicit RectangleTextureGLTest();
 
-        void construct();
-        void bind();
+    void construct();
+    void bind();
 
-        void sampling();
-        void samplingSRGBDecode();
-        void samplingBorderInteger();
-        void samplingSwizzle();
-        void samplingDepthStencilMode();
+    void sampling();
+    void samplingSRGBDecode();
+    void samplingBorderInteger();
+    void samplingSwizzle();
+    void samplingDepthStencilMode();
 
-        void storage();
+    void storage();
 
-        void image();
-        void imageBuffer();
-        void subImage();
-        void subImageBuffer();
+    void image();
+    void imageBuffer();
+    void subImage();
+    void subImageBuffer();
 
-        void invalidateImage();
-        void invalidateSubImage();
+    void invalidateImage();
+    void invalidateSubImage();
 };
 
 RectangleTextureGLTest::RectangleTextureGLTest() {
diff --git a/src/Magnum/Test/RenderbufferGLTest.cpp b/src/Magnum/Test/RenderbufferGLTest.cpp
index 3407d46c3..7eaad6575 100644
--- a/src/Magnum/Test/RenderbufferGLTest.cpp
+++ b/src/Magnum/Test/RenderbufferGLTest.cpp
@@ -32,18 +32,17 @@
 
 namespace Magnum { namespace Test {
 
-class RenderbufferGLTest: public AbstractOpenGLTester {
-    public:
-        explicit RenderbufferGLTest();
+struct RenderbufferGLTest: AbstractOpenGLTester {
+    explicit RenderbufferGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 
-        void setStorage();
-        void setStorageMultisample();
+    void setStorage();
+    void setStorageMultisample();
 };
 
 RenderbufferGLTest::RenderbufferGLTest() {
diff --git a/src/Magnum/Test/RendererTest.cpp b/src/Magnum/Test/RendererTest.cpp
index 308cd7ae6..12e071232 100644
--- a/src/Magnum/Test/RendererTest.cpp
+++ b/src/Magnum/Test/RendererTest.cpp
@@ -30,13 +30,12 @@
 
 namespace Magnum { namespace Test {
 
-class RendererTest: public TestSuite::Tester {
-    public:
-        explicit RendererTest();
+struct RendererTest: TestSuite::Tester {
+    explicit RendererTest();
 
-        void debugError();
-        void debugResetNotificationStrategy();
-        void debugGraphicsResetStatus();
+    void debugError();
+    void debugResetNotificationStrategy();
+    void debugGraphicsResetStatus();
 };
 
 RendererTest::RendererTest() {
diff --git a/src/Magnum/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp
index bda4ad0b0..70b5b75a4 100644
--- a/src/Magnum/Test/ResourceManagerTest.cpp
+++ b/src/Magnum/Test/ResourceManagerTest.cpp
@@ -31,21 +31,20 @@
 
 namespace Magnum { namespace Test {
 
-class ResourceManagerTest: public TestSuite::Tester {
-    public:
-        ResourceManagerTest();
-
-        void state();
-        void stateFallback();
-        void stateDisallowed();
-        void basic();
-        void residentPolicy();
-        void referenceCountedPolicy();
-        void manualPolicy();
-        void defaults();
-        void clear();
-        void clearWhileReferenced();
-        void loader();
+struct ResourceManagerTest: TestSuite::Tester {
+    explicit ResourceManagerTest();
+
+    void state();
+    void stateFallback();
+    void stateDisallowed();
+    void basic();
+    void residentPolicy();
+    void referenceCountedPolicy();
+    void manualPolicy();
+    void defaults();
+    void clear();
+    void clearWhileReferenced();
+    void loader();
 };
 
 class Data {
diff --git a/src/Magnum/Test/SampleQueryGLTest.cpp b/src/Magnum/Test/SampleQueryGLTest.cpp
index 78ece0175..ab0fbf203 100644
--- a/src/Magnum/Test/SampleQueryGLTest.cpp
+++ b/src/Magnum/Test/SampleQueryGLTest.cpp
@@ -38,14 +38,13 @@
 
 namespace Magnum { namespace Test {
 
-class SampleQueryGLTest: public AbstractOpenGLTester {
-    public:
-        explicit SampleQueryGLTest();
+struct SampleQueryGLTest: AbstractOpenGLTester {
+    explicit SampleQueryGLTest();
 
-        void querySamplesPassed();
-        #ifndef MAGNUM_TARGET_GLES
-        void conditionalRender();
-        #endif
+    void querySamplesPassed();
+    #ifndef MAGNUM_TARGET_GLES
+    void conditionalRender();
+    #endif
 };
 
 SampleQueryGLTest::SampleQueryGLTest() {
diff --git a/src/Magnum/Test/SamplerTest.cpp b/src/Magnum/Test/SamplerTest.cpp
index 9239e033b..89b210752 100644
--- a/src/Magnum/Test/SamplerTest.cpp
+++ b/src/Magnum/Test/SamplerTest.cpp
@@ -30,18 +30,17 @@
 
 namespace Magnum { namespace Test {
 
-class SamplerTest: public TestSuite::Tester {
-    public:
-        explicit SamplerTest();
-
-        void debugFilter();
-        void debugMipmap();
-        void debugWrapping();
-        void debugCompareMode();
-        void debugCompareFunction();
-        #ifndef MAGNUM_TARGET_GLES
-        void debugDepthStencilMode();
-        #endif
+struct SamplerTest: TestSuite::Tester {
+    explicit SamplerTest();
+
+    void debugFilter();
+    void debugMipmap();
+    void debugWrapping();
+    void debugCompareMode();
+    void debugCompareFunction();
+    #ifndef MAGNUM_TARGET_GLES
+    void debugDepthStencilMode();
+    #endif
 };
 
 SamplerTest::SamplerTest() {
diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp
index 1a8c144e8..b090f6859 100644
--- a/src/Magnum/Test/ShaderGLTest.cpp
+++ b/src/Magnum/Test/ShaderGLTest.cpp
@@ -34,20 +34,19 @@
 
 namespace Magnum { namespace Test {
 
-class ShaderGLTest: public AbstractOpenGLTester {
-    public:
-        explicit ShaderGLTest();
+struct ShaderGLTest: AbstractOpenGLTester {
+    explicit ShaderGLTest();
 
-        void construct();
-        void constructNoVersion();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructNoVersion();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 
-        void addSource();
-        void addFile();
-        void compile();
+    void addSource();
+    void addFile();
+    void compile();
 };
 
 ShaderGLTest::ShaderGLTest() {
diff --git a/src/Magnum/Test/ShaderTest.cpp b/src/Magnum/Test/ShaderTest.cpp
index e15bdf946..fbe2e845f 100644
--- a/src/Magnum/Test/ShaderTest.cpp
+++ b/src/Magnum/Test/ShaderTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Test {
 
-class ShaderTest: public TestSuite::Tester {
-    public:
-        explicit ShaderTest();
+struct ShaderTest: TestSuite::Tester {
+    explicit ShaderTest();
 
-        void debugType();
+    void debugType();
 };
 
 ShaderTest::ShaderTest() {
diff --git a/src/Magnum/Test/TextureArrayGLTest.cpp b/src/Magnum/Test/TextureArrayGLTest.cpp
index 7896a0133..0ed906ec6 100644
--- a/src/Magnum/Test/TextureArrayGLTest.cpp
+++ b/src/Magnum/Test/TextureArrayGLTest.cpp
@@ -36,87 +36,86 @@
 
 namespace Magnum { namespace Test {
 
-class TextureArrayGLTest: public AbstractOpenGLTester {
-    public:
-        explicit TextureArrayGLTest();
+struct TextureArrayGLTest: AbstractOpenGLTester {
+    explicit TextureArrayGLTest();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void construct1D();
-        #endif
-        void construct2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void construct1D();
+    #endif
+    void construct2D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void bind1D();
-        #endif
-        void bind2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void bind1D();
+    #endif
+    void bind2D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void sampling1D();
-        #endif
-        void sampling2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void sampling1D();
+    #endif
+    void sampling2D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingSRGBDecode1D();
-        #endif
-        void samplingSRGBDecode2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingSRGBDecode1D();
+    #endif
+    void samplingSRGBDecode2D();
 
-        #ifndef MAGNUM_TARGET_GLES2
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingSwizzle1D();
-        #endif
-        void samplingSwizzle2D();
-        #else
-        void samplingMaxLevel2D();
-        void samplingCompare2D();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingSwizzle1D();
+    #endif
+    void samplingSwizzle2D();
+    #else
+    void samplingMaxLevel2D();
+    void samplingCompare2D();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingBorderInteger1D();
-        void samplingBorderInteger2D();
-        void samplingDepthStencilMode1D();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void samplingDepthStencilMode2D();
-        #endif
-        #ifdef MAGNUM_TARGET_GLES
-        void samplingBorder2D();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingBorderInteger1D();
+    void samplingBorderInteger2D();
+    void samplingDepthStencilMode1D();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void samplingDepthStencilMode2D();
+    #endif
+    #ifdef MAGNUM_TARGET_GLES
+    void samplingBorder2D();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void storage1D();
-        #endif
-        void storage2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void storage1D();
+    #endif
+    void storage2D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void image1D();
-        void image1DBuffer();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void image2D();
-        void image2DBuffer();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void image1D();
+    void image1DBuffer();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void image2D();
+    void image2DBuffer();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void subImage1D();
-        void subImage1DBuffer();
-        #endif
-        void subImage2D();
-        void subImage2DBuffer();
+    #ifndef MAGNUM_TARGET_GLES
+    void subImage1D();
+    void subImage1DBuffer();
+    #endif
+    void subImage2D();
+    void subImage2DBuffer();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void generateMipmap1D();
-        #endif
-        void generateMipmap2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void generateMipmap1D();
+    #endif
+    void generateMipmap2D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void invalidateImage1D();
-        #endif
-        void invalidateImage2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void invalidateImage1D();
+    #endif
+    void invalidateImage2D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void invalidateSubImage1D();
-        #endif
-        void invalidateSubImage2D();
+    #ifndef MAGNUM_TARGET_GLES
+    void invalidateSubImage1D();
+    #endif
+    void invalidateSubImage2D();
 };
 
 TextureArrayGLTest::TextureArrayGLTest() {
diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp
index 44835ed0e..cb7dc7b8c 100644
--- a/src/Magnum/Test/TextureGLTest.cpp
+++ b/src/Magnum/Test/TextureGLTest.cpp
@@ -38,111 +38,110 @@
 
 namespace Magnum { namespace Test {
 
-class TextureGLTest: public AbstractOpenGLTester {
-    public:
-        explicit TextureGLTest();
+struct TextureGLTest: AbstractOpenGLTester {
+    explicit TextureGLTest();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void construct1D();
-        #endif
-        void construct2D();
-        void construct3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void construct1D();
+    #endif
+    void construct2D();
+    void construct3D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void bind1D();
-        #endif
-        void bind2D();
-        void bind3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void bind1D();
+    #endif
+    void bind2D();
+    void bind3D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void sampling1D();
-        #endif
-        void sampling2D();
-        void sampling3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void sampling1D();
+    #endif
+    void sampling2D();
+    void sampling3D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingSRGBDecode1D();
-        #endif
-        void samplingSRGBDecode2D();
-        void samplingSRGBDecode3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingSRGBDecode1D();
+    #endif
+    void samplingSRGBDecode2D();
+    void samplingSRGBDecode3D();
 
-        #ifndef MAGNUM_TARGET_GLES2
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingSwizzle1D();
-        #endif
-        void samplingSwizzle2D();
-        void samplingSwizzle3D();
-        #else
-        void samplingMaxLevel2D();
-        void samplingMaxLevel3D();
-        void samplingCompare2D();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingSwizzle1D();
+    #endif
+    void samplingSwizzle2D();
+    void samplingSwizzle3D();
+    #else
+    void samplingMaxLevel2D();
+    void samplingMaxLevel3D();
+    void samplingCompare2D();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void samplingBorderInteger2D();
-        void samplingBorderInteger3D();
-        void samplingDepthStencilMode1D();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void samplingDepthStencilMode2D();
-        void samplingDepthStencilMode3D();
-        #endif
-        #ifdef MAGNUM_TARGET_GLES
-        void samplingBorder2D();
-        void samplingBorder3D();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void samplingBorderInteger2D();
+    void samplingBorderInteger3D();
+    void samplingDepthStencilMode1D();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void samplingDepthStencilMode2D();
+    void samplingDepthStencilMode3D();
+    #endif
+    #ifdef MAGNUM_TARGET_GLES
+    void samplingBorder2D();
+    void samplingBorder3D();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void storage1D();
-        #endif
-        void storage2D();
-        void storage3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void storage1D();
+    #endif
+    void storage2D();
+    void storage3D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void image1D();
-        #endif
-        #ifndef MAGNUM_TARGET_GLES2
-        void image1DBuffer();
-        #endif
-        void image2D();
-        #ifndef MAGNUM_TARGET_GLES2
-        void image2DBuffer();
-        #endif
-        void image3D();
-        #ifndef MAGNUM_TARGET_GLES2
-        void image3DBuffer();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void image1D();
+    #endif
+    #ifndef MAGNUM_TARGET_GLES2
+    void image1DBuffer();
+    #endif
+    void image2D();
+    #ifndef MAGNUM_TARGET_GLES2
+    void image2DBuffer();
+    #endif
+    void image3D();
+    #ifndef MAGNUM_TARGET_GLES2
+    void image3DBuffer();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void subImage1D();
-        void subImage1DBuffer();
-        #endif
-        void subImage2D();
-        #ifndef MAGNUM_TARGET_GLES2
-        void subImage2DBuffer();
-        #endif
-        void subImage3D();
-        #ifndef MAGNUM_TARGET_GLES2
-        void subImage3DBuffer();
-        #endif
+    #ifndef MAGNUM_TARGET_GLES
+    void subImage1D();
+    void subImage1DBuffer();
+    #endif
+    void subImage2D();
+    #ifndef MAGNUM_TARGET_GLES2
+    void subImage2DBuffer();
+    #endif
+    void subImage3D();
+    #ifndef MAGNUM_TARGET_GLES2
+    void subImage3DBuffer();
+    #endif
 
-        #ifndef MAGNUM_TARGET_GLES
-        void generateMipmap1D();
-        #endif
-        void generateMipmap2D();
-        void generateMipmap3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void generateMipmap1D();
+    #endif
+    void generateMipmap2D();
+    void generateMipmap3D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void invalidateImage1D();
-        #endif
-        void invalidateImage2D();
-        void invalidateImage3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void invalidateImage1D();
+    #endif
+    void invalidateImage2D();
+    void invalidateImage3D();
 
-        #ifndef MAGNUM_TARGET_GLES
-        void invalidateSubImage1D();
-        #endif
-        void invalidateSubImage2D();
-        void invalidateSubImage3D();
+    #ifndef MAGNUM_TARGET_GLES
+    void invalidateSubImage1D();
+    #endif
+    void invalidateSubImage2D();
+    void invalidateSubImage3D();
 };
 
 TextureGLTest::TextureGLTest() {
diff --git a/src/Magnum/Test/TimeQueryGLTest.cpp b/src/Magnum/Test/TimeQueryGLTest.cpp
index 7a1097dfe..fddd09a64 100644
--- a/src/Magnum/Test/TimeQueryGLTest.cpp
+++ b/src/Magnum/Test/TimeQueryGLTest.cpp
@@ -28,12 +28,11 @@
 
 namespace Magnum { namespace Test {
 
-class TimeQueryGLTest: public AbstractOpenGLTester {
-    public:
-        explicit TimeQueryGLTest();
+struct TimeQueryGLTest: AbstractOpenGLTester {
+    explicit TimeQueryGLTest();
 
-        void queryTime();
-        void queryTimestamp();
+    void queryTime();
+    void queryTimestamp();
 };
 
 TimeQueryGLTest::TimeQueryGLTest() {
diff --git a/src/Magnum/Test/TransformFeedbackGLTest.cpp b/src/Magnum/Test/TransformFeedbackGLTest.cpp
index 3fbb1a09e..202af4b47 100644
--- a/src/Magnum/Test/TransformFeedbackGLTest.cpp
+++ b/src/Magnum/Test/TransformFeedbackGLTest.cpp
@@ -33,22 +33,21 @@
 
 namespace Magnum { namespace Test {
 
-class TransformFeedbackGLTest: public AbstractOpenGLTester {
-    public:
-        explicit TransformFeedbackGLTest();
+struct TransformFeedbackGLTest: AbstractOpenGLTester {
+    explicit TransformFeedbackGLTest();
 
-        void construct();
-        void constructCopy();
-        void constructMove();
+    void construct();
+    void constructCopy();
+    void constructMove();
 
-        void label();
+    void label();
 
-        void attachBase();
-        void attachRange();
-        void attachBases();
-        void attachRanges();
+    void attachBase();
+    void attachRange();
+    void attachBases();
+    void attachRanges();
 
-        void interleaved();
+    void interleaved();
 };
 
 TransformFeedbackGLTest::TransformFeedbackGLTest() {
diff --git a/src/Magnum/Test/VersionTest.cpp b/src/Magnum/Test/VersionTest.cpp
index 75a26c60b..0120fc82f 100644
--- a/src/Magnum/Test/VersionTest.cpp
+++ b/src/Magnum/Test/VersionTest.cpp
@@ -29,12 +29,11 @@
 
 namespace Magnum { namespace Test {
 
-class VersionTest: public TestSuite::Tester {
-    public:
-        explicit VersionTest();
+struct VersionTest: TestSuite::Tester {
+    explicit VersionTest();
 
-        void fromNumber();
-        void toNumber();
+    void fromNumber();
+    void toNumber();
 };
 
 VersionTest::VersionTest() {
diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
index 8ab080a14..6bf54ee0b 100644
--- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
+++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp
@@ -35,20 +35,19 @@
 
 namespace Magnum { namespace Text { namespace Test {
 
-class AbstractFontConverterTest: public TestSuite::Tester {
-    public:
-        explicit AbstractFontConverterTest();
+struct AbstractFontConverterTest: TestSuite::Tester {
+    explicit AbstractFontConverterTest();
 
-        void convertGlyphs();
+    void convertGlyphs();
 
-        void exportFontToSingleData();
-        void exportFontToFile();
+    void exportFontToSingleData();
+    void exportFontToFile();
 
-        void exportGlyphCacheToSingleData();
-        void exportGlyphCacheToFile();
+    void exportGlyphCacheToSingleData();
+    void exportGlyphCacheToFile();
 
-        void importGlyphCacheFromSingleData();
-        void importGlyphCacheFromFile();
+    void importGlyphCacheFromSingleData();
+    void importGlyphCacheFromFile();
 };
 
 AbstractFontConverterTest::AbstractFontConverterTest() {
diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp
index 70be28372..1a3b45ddc 100644
--- a/src/Magnum/Text/Test/AbstractFontTest.cpp
+++ b/src/Magnum/Text/Test/AbstractFontTest.cpp
@@ -34,12 +34,11 @@
 
 namespace Magnum { namespace Text { namespace Test {
 
-class AbstractFontTest: public TestSuite::Tester {
-    public:
-        explicit AbstractFontTest();
+struct AbstractFontTest: TestSuite::Tester {
+    explicit AbstractFontTest();
 
-        void openSingleData();
-        void openFile();
+    void openSingleData();
+    void openFile();
 };
 
 AbstractFontTest::AbstractFontTest() {
diff --git a/src/Magnum/Text/Test/AbstractLayouterTest.cpp b/src/Magnum/Text/Test/AbstractLayouterTest.cpp
index e52bb343f..9f0d3450a 100644
--- a/src/Magnum/Text/Test/AbstractLayouterTest.cpp
+++ b/src/Magnum/Text/Test/AbstractLayouterTest.cpp
@@ -30,11 +30,10 @@
 
 namespace Magnum { namespace Text { namespace Test {
 
-class AbstractLayouterTest: public TestSuite::Tester {
-    public:
-        explicit AbstractLayouterTest();
+struct AbstractLayouterTest: TestSuite::Tester {
+    explicit AbstractLayouterTest();
 
-        void renderGlyph();
+    void renderGlyph();
 };
 
 AbstractLayouterTest::AbstractLayouterTest() {
diff --git a/src/Magnum/Text/Test/GlyphCacheGLTest.cpp b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp
index 2cdb3c945..8ce9999d2 100644
--- a/src/Magnum/Text/Test/GlyphCacheGLTest.cpp
+++ b/src/Magnum/Text/Test/GlyphCacheGLTest.cpp
@@ -30,13 +30,12 @@
 
 namespace Magnum { namespace Text { namespace Test {
 
-class GlyphCacheGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit GlyphCacheGLTest();
+struct GlyphCacheGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit GlyphCacheGLTest();
 
-        void initialize();
-        void access();
-        void reserve();
+    void initialize();
+    void access();
+    void reserve();
 };
 
 GlyphCacheGLTest::GlyphCacheGLTest() {
diff --git a/src/Magnum/Text/Test/RendererGLTest.cpp b/src/Magnum/Text/Test/RendererGLTest.cpp
index 0d35b7a60..cd12f93df 100644
--- a/src/Magnum/Text/Test/RendererGLTest.cpp
+++ b/src/Magnum/Text/Test/RendererGLTest.cpp
@@ -29,16 +29,15 @@
 
 namespace Magnum { namespace Text { namespace Test {
 
-class RendererGLTest: public Magnum::Test::AbstractOpenGLTester {
-    public:
-        explicit RendererGLTest();
+struct RendererGLTest: Magnum::Test::AbstractOpenGLTester {
+    explicit RendererGLTest();
 
-        void renderData();
-        void renderMesh();
-        void renderMeshIndexType();
-        void mutableText();
+    void renderData();
+    void renderMesh();
+    void renderMeshIndexType();
+    void mutableText();
 
-        void multiline();
+    void multiline();
 };
 
 RendererGLTest::RendererGLTest() {
diff --git a/src/Magnum/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp
index c7e07a664..8ba7ce764 100644
--- a/src/Magnum/TextureTools/Test/AtlasTest.cpp
+++ b/src/Magnum/TextureTools/Test/AtlasTest.cpp
@@ -31,14 +31,13 @@
 
 namespace Magnum { namespace TextureTools { namespace Test {
 
-class AtlasTest: public TestSuite::Tester {
-    public:
-        explicit AtlasTest();
-
-        void create();
-        void createPadding();
-        void createEmpty();
-        void createTooSmall();
+struct AtlasTest: TestSuite::Tester {
+    explicit AtlasTest();
+
+    void create();
+    void createPadding();
+    void createEmpty();
+    void createTooSmall();
 };
 
 AtlasTest::AtlasTest() {