diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
index 8a78da7ea03..f023ab53977 100644
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -413,45 +413,10 @@ endif()
 # Lagom Utilities
 add_serenity_subdirectory(Utilities)
 
+# Tests
 include(CTest)
 if (BUILD_TESTING)
-    # LibTest tests from Tests/
-    set(TEST_DIRECTORIES
-        AK
-        LibCrypto
-        LibCompress
-        LibCore
-        LibDiff
-        LibDNS
-        LibGC
-        LibJS
-        LibRegex
-        LibTest
-        LibTextCodec
-        LibThreading
-        LibTLS
-        LibUnicode
-        LibURL
-        LibWasm
-        LibXML
-    )
-
-    if (ENABLE_GUI_TARGETS)
-        list(APPEND TEST_DIRECTORIES
-            LibGfx
-            LibMedia
-            LibWeb
-            LibWebView
-        )
-    endif()
-
-    if (ENABLE_CLANG_PLUGINS AND CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
-        list(APPEND TEST_DIRECTORIES ClangPlugins)
-    endif()
-
-    foreach (dir IN LISTS TEST_DIRECTORIES)
-        add_serenity_subdirectory("Tests/${dir}")
-    endforeach()
+    add_serenity_subdirectory(Tests)
 endif()
 
 install(TARGETS js COMPONENT js)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9127ba058b9..859d9ffdda1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,20 +1,28 @@
 add_subdirectory(AK)
+add_subdirectory(LibCrypto)
 add_subdirectory(LibCompress)
 add_subdirectory(LibCore)
 add_subdirectory(LibDiff)
 add_subdirectory(LibDNS)
-add_subdirectory(LibGfx)
+add_subdirectory(LibGC)
 add_subdirectory(LibJS)
 add_subdirectory(LibRegex)
 add_subdirectory(LibTest)
 add_subdirectory(LibTextCodec)
 add_subdirectory(LibThreading)
+add_subdirectory(LibTLS)
 add_subdirectory(LibUnicode)
 add_subdirectory(LibURL)
-add_subdirectory(LibMedia)
 add_subdirectory(LibWasm)
-add_subdirectory(LibWeb)
-add_subdirectory(LibWebView)
 add_subdirectory(LibXML)
-add_subdirectory(LibCrypto)
-add_subdirectory(LibTLS)
+
+if (ENABLE_GUI_TARGETS)
+    add_subdirectory(LibGfx)
+    add_subdirectory(LibMedia)
+    add_subdirectory(LibWeb)
+    add_subdirectory(LibWebView)
+endif()
+
+if (ENABLE_CLANG_PLUGINS AND CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
+    add_subdirectory(ClangPlugins)
+endif()