diff --git a/src/Math/Test/CMakeLists.txt b/src/Math/Test/CMakeLists.txt
index fbc2d8f39..02c3e4459 100644
--- a/src/Math/Test/CMakeLists.txt
+++ b/src/Math/Test/CMakeLists.txt
@@ -1,21 +1,13 @@
-corrade_add_test(TypeTraitsTest TypeTraitsTest.h TypeTraitsTest.cpp)
+corrade_add_test(MathTypeTraitsTest TypeTraitsTest.h TypeTraitsTest.cpp)
 
-corrade_add_test(VectorTest VectorTest.h VectorTest.cpp)
-target_link_libraries(VectorTest ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(Vector2Test Vector2Test.h Vector2Test.cpp)
-target_link_libraries(Vector2Test ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(Vector3Test Vector3Test.h Vector3Test.cpp)
-target_link_libraries(Vector3Test ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(Vector4Test Vector4Test.h Vector4Test.cpp)
-target_link_libraries(Vector4Test ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathVectorTest VectorTest.h VectorTest.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathVector2Test Vector2Test.h Vector2Test.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathVector3Test Vector3Test.h Vector3Test.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathVector4Test Vector4Test.h Vector4Test.cpp ${CORRADE_UTILITY_LIBRARY})
 
-corrade_add_test(MatrixTest MatrixTest.h MatrixTest.cpp)
-target_link_libraries(MatrixTest ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(Matrix3Test Matrix3Test.h Matrix3Test.cpp)
-target_link_libraries(Matrix3Test ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(Matrix4Test Matrix4Test.h Matrix4Test.cpp)
-target_link_libraries(Matrix4Test ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathMatrixTest MatrixTest.h MatrixTest.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathMatrix3Test Matrix3Test.h Matrix3Test.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MathMatrix4Test Matrix4Test.h Matrix4Test.cpp ${CORRADE_UTILITY_LIBRARY})
 
-corrade_add_test(MathTest MathTest.h MathTest.cpp)
-target_link_libraries(MathTest MagnumMath)
-corrade_add_test(GeometryUtilsTest GeometryUtilsTest.h GeometryUtilsTest.cpp)
+corrade_add_test(MathTest MathTest.h MathTest.cpp MagnumMath)
+corrade_add_test(MathGeometryUtilsTest GeometryUtilsTest.h GeometryUtilsTest.cpp)
diff --git a/src/MeshTools/CMakeLists.txt b/src/MeshTools/CMakeLists.txt
index 5b69ab40c..c2295ab07 100644
--- a/src/MeshTools/CMakeLists.txt
+++ b/src/MeshTools/CMakeLists.txt
@@ -10,7 +10,7 @@ if(WIN32)
     set_target_properties(MagnumMeshTools PROPERTIES COMPILE_FLAGS -DMESHTOOLS_EXPORTING)
 endif()
 
-target_link_libraries(MagnumMeshTools ${MAGNUM_LIBRARY})
+target_link_libraries(MagnumMeshTools Magnum)
 
 install(TARGETS MagnumMeshTools DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 
diff --git a/src/MeshTools/Test/CMakeLists.txt b/src/MeshTools/Test/CMakeLists.txt
index 1ebd8120f..b280d2c61 100644
--- a/src/MeshTools/Test/CMakeLists.txt
+++ b/src/MeshTools/Test/CMakeLists.txt
@@ -1,12 +1,12 @@
-corrade_add_test(CleanTest CleanTest.h CleanTest.cpp ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(CombineIndexedArraysTest CombineIndexedArraysTest.h CombineIndexedArraysTest.cpp ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(CompressIndicesTest CompressIndicesTest.h CompressIndicesTest.cpp ${CORRADE_UTILITY_LIBRARY} ${MAGNUM_LIBRARY})
-corrade_add_test(FlipNormalsTest FlipNormalsTest.h FlipNormalsTest.cpp MagnumMeshToolsTestLib)
-corrade_add_test(GenerateFlatNormalsTest GenerateFlatNormalsTest.h GenerateFlatNormalsTest.cpp MagnumMeshToolsTestLib)
-corrade_add_test(InterleaveTest InterleaveTest.h InterleaveTest.cpp ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(SubdivideTest SubdivideTest.h SubdivideTest.cpp ${CORRADE_UTILITY_LIBRARY})
-corrade_add_test(SubdivideCleanBenchmark SubdivideCleanBenchmark.h SubdivideCleanBenchmark.cpp ${CORRADE_UTILITY_LIBRARY} ${MAGNUM_PRIMITIVES_LIBRARY})
-corrade_add_test(TipsifyTest TipsifyTest.h TipsifyTest.cpp ${MAGNUM_MESHTOOLS_LIBRARY})
+corrade_add_test(MeshToolsCleanTest CleanTest.h CleanTest.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MeshToolsCombineIndexedArraysTest CombineIndexedArraysTest.h CombineIndexedArraysTest.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MeshToolsCompressIndicesTest CompressIndicesTest.h CompressIndicesTest.cpp Magnum)
+corrade_add_test(MeshToolsFlipNormalsTest FlipNormalsTest.h FlipNormalsTest.cpp MagnumMeshToolsTestLib)
+corrade_add_test(MeshToolsGenerateFlatNormalsTest GenerateFlatNormalsTest.h GenerateFlatNormalsTest.cpp MagnumMeshToolsTestLib)
+corrade_add_test(MeshToolsInterleaveTest InterleaveTest.h InterleaveTest.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MeshToolsSubdivideTest SubdivideTest.h SubdivideTest.cpp ${CORRADE_UTILITY_LIBRARY})
+corrade_add_test(MeshToolsSubdivideCleanBenchmark SubdivideCleanBenchmark.h SubdivideCleanBenchmark.cpp ${MAGNUM_PRIMITIVES_LIBRARY})
+corrade_add_test(MeshToolsTipsifyTest TipsifyTest.h TipsifyTest.cpp ${MAGNUM_MESHTOOLS_LIBRARY})
 
 # Graceful assert for testing
-set_target_properties(CombineIndexedArraysTest InterleaveTest SubdivideTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT)
+set_target_properties(MeshToolsCombineIndexedArraysTest MeshToolsInterleaveTest MeshToolsSubdivideTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT)
diff --git a/src/Primitives/Test/CMakeLists.txt b/src/Primitives/Test/CMakeLists.txt
index dff5ee805..d45a534e9 100644
--- a/src/Primitives/Test/CMakeLists.txt
+++ b/src/Primitives/Test/CMakeLists.txt
@@ -1,2 +1,2 @@
-corrade_add_test(CapsuleTest CapsuleTest.h CapsuleTest.cpp ${MAGNUM_PRIMITIVES_LIBRARY})
-corrade_add_test(UVSphereTest UVSphereTest.h UVSphereTest.cpp ${MAGNUM_PRIMITIVES_LIBRARY})
+corrade_add_test(PrimitivesCapsuleTest CapsuleTest.h CapsuleTest.cpp MagnumPrimitives)
+corrade_add_test(PrimitivesUVSphereTest UVSphereTest.h UVSphereTest.cpp MagnumPrimitives)
diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt
index 9d8f9e8ee..290555900 100644
--- a/src/Shaders/CMakeLists.txt
+++ b/src/Shaders/CMakeLists.txt
@@ -5,6 +5,6 @@ set(Shaders_SRCS
 )
 
 add_library(MagnumShaders SHARED ${Shaders_SRCS})
-target_link_libraries(MagnumShaders ${MAGNUM_LIBRARY})
+target_link_libraries(MagnumShaders Magnum)
 
 install(TARGETS MagnumShaders DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})