diff --git a/src/Magnum/Platform/Test/CMakeLists.txt b/src/Magnum/Platform/Test/CMakeLists.txt
index 11ced3971..82f5128b7 100644
--- a/src/Magnum/Platform/Test/CMakeLists.txt
+++ b/src/Magnum/Platform/Test/CMakeLists.txt
@@ -26,26 +26,31 @@
 if(WITH_ANDROIDAPPLICATION)
     add_library(PlatformAndroidApplicationTest SHARED AndroidApplicationTest.cpp)
     target_link_libraries(PlatformAndroidApplicationTest PRIVATE MagnumAndroidApplication)
+    set_target_properties(PlatformAndroidApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_GLFWAPPLICATION)
     add_executable(PlatformGlfwApplicationTest GlfwApplicationTest.cpp)
     target_link_libraries(PlatformGlfwApplicationTest PRIVATE MagnumGlfwApplication)
+    set_target_properties(PlatformGlfwApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_GLUTAPPLICATION)
     add_executable(PlatformGlutApplicationTest GlutApplicationTest.cpp)
     target_link_libraries(PlatformGlutApplicationTest PRIVATE MagnumGlutApplication)
+    set_target_properties(PlatformGlutApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_GLXAPPLICATION)
     add_executable(PlatformGlxApplicationTest GlxApplicationTest.cpp)
     target_link_libraries(PlatformGlxApplicationTest PRIVATE MagnumGlxApplication)
+    set_target_properties(PlatformGlxApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_SDL2APPLICATION)
     add_executable(PlatformSdl2ApplicationTest Sdl2ApplicationTest.cpp)
     target_link_libraries(PlatformSdl2ApplicationTest PRIVATE MagnumSdl2Application)
+    set_target_properties(PlatformSdl2ApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
     if(CORRADE_TARGET_IOS)
         set_target_properties(PlatformSdl2ApplicationTest PROPERTIES
             MACOSX_BUNDLE ON
@@ -56,21 +61,25 @@ endif()
 if(WITH_XEGLAPPLICATION)
     add_executable(PlatformXEglApplicationTest XEglApplicationTest.cpp)
     target_link_libraries(PlatformXEglApplicationTest PRIVATE MagnumXEglApplication)
+    set_target_properties(PlatformXEglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_WINDOWLESSCGLAPPLICATION)
     add_executable(PlatformWindowlessCglApplicationTest WindowlessCglApplicationTest.cpp)
     target_link_libraries(PlatformWindowlessCglApplicationTest PRIVATE MagnumWindowlessCglApplication)
+    set_target_properties(PlatformWindowlessCglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_WINDOWLESSEGLAPPLICATION)
     add_executable(PlatformWindowlessEglApplicationTest WindowlessEglApplicationTest.cpp)
     target_link_libraries(PlatformWindowlessEglApplicationTest PRIVATE MagnumWindowlessEglApplication)
+    set_target_properties(PlatformWindowlessEglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_WINDOWLESSGLXAPPLICATION)
     add_executable(PlatformWindowlessGlxApplicationTest WindowlessGlxApplicationTest.cpp)
     target_link_libraries(PlatformWindowlessGlxApplicationTest PRIVATE MagnumWindowlessGlxApplication)
+    set_target_properties(PlatformWindowlessGlxApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_WINDOWLESSIOSAPPLICATION)
@@ -78,15 +87,18 @@ if(WITH_WINDOWLESSIOSAPPLICATION)
     target_link_libraries(PlatformWindowlessIosApplicationTest PRIVATE MagnumWindowlessIosApplication)
     set_target_properties(PlatformWindowlessIosApplicationTest PROPERTIES
         MACOSX_BUNDLE ON
-        XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
+        XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
+        FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_WINDOWLESSWGLAPPLICATION)
     add_executable(PlatformWindowlessWglApplicationTest WindowlessWglApplicationTest.cpp)
     target_link_libraries(PlatformWindowlessWglApplicationTest PRIVATE MagnumWindowlessWglApplication)
+    set_target_properties(PlatformWindowlessWglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
 
 if(WITH_WINDOWLESSWINDOWSEGLAPPLICATION)
     add_executable(PlatformWindowlessWindowsEglApplicationTest WindowlessWindowsEglApplicationTest.cpp)
     target_link_libraries(PlatformWindowlessWindowsEglApplicationTest PRIVATE MagnumWindowlessWindowsEglApplication)
+    set_target_properties(PlatformWindowlessWindowsEglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
 endif()
diff --git a/src/Magnum/Primitives/Test/CMakeLists.txt b/src/Magnum/Primitives/Test/CMakeLists.txt
index d0ff68730..ef3493e77 100644
--- a/src/Magnum/Primitives/Test/CMakeLists.txt
+++ b/src/Magnum/Primitives/Test/CMakeLists.txt
@@ -45,6 +45,7 @@ set_target_properties(
     PrimitivesCubeTest
     PrimitivesConeTest
     PrimitivesCylinderTest
+    PrimitivesGridTest
     PrimitivesIcosphereTest
     PrimitivesLineTest
     PrimitivesPlaneTest
diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt
index 2c6d0c66f..21552a349 100644
--- a/src/Magnum/Test/CMakeLists.txt
+++ b/src/Magnum/Test/CMakeLists.txt
@@ -53,5 +53,6 @@ set_target_properties(
     ResourceManagerTest
     ResourceManagerLocalInstanceTestLib
     ResourceManagerLocalInstanceTest
+    SamplerTest
     TagsTest
     PROPERTIES FOLDER "Magnum/Test")
diff --git a/src/MagnumExternal/Optional/Test/CMakeLists.txt b/src/MagnumExternal/Optional/Test/CMakeLists.txt
index 65bc6ef5b..cccf2b4cd 100644
--- a/src/MagnumExternal/Optional/Test/CMakeLists.txt
+++ b/src/MagnumExternal/Optional/Test/CMakeLists.txt
@@ -27,6 +27,7 @@ corrade_add_test(StdOptionalTest StdOptionalTest.cpp)
 target_include_directories(StdOptionalTest PRIVATE
     ${PROJECT_SOURCE_DIR}/src
     ${PROJECT_BINARY_DIR}/src)
+set_target_properties(StdOptionalTest PROPERTIES FOLDER "MagnumExternal/Optional/Test")
 
 # Try using C++17 on newer compilers. Can't use VERSION_GREATER_EQUAL because
 # older CMake doesn't support these. No idea how to detect libc++ presence on