diff --git a/AK/CMakeLists.txt b/AK/CMakeLists.txt
index c6dba11efff..509d3d45092 100644
--- a/AK/CMakeLists.txt
+++ b/AK/CMakeLists.txt
@@ -1,5 +1,3 @@
 include(${CMAKE_SOURCE_DIR}/Meta/CMake/utils.cmake)
 serenity_install_headers(AK)
 serenity_install_sources(AK)
-
-add_subdirectory(Tests)
diff --git a/AK/Tests/CMakeLists.txt b/Tests/AK/CMakeLists.txt
similarity index 100%
rename from AK/Tests/CMakeLists.txt
rename to Tests/AK/CMakeLists.txt
diff --git a/AK/Tests/TestAllOf.cpp b/Tests/AK/TestAllOf.cpp
similarity index 100%
rename from AK/Tests/TestAllOf.cpp
rename to Tests/AK/TestAllOf.cpp
diff --git a/AK/Tests/TestAnyOf.cpp b/Tests/AK/TestAnyOf.cpp
similarity index 100%
rename from AK/Tests/TestAnyOf.cpp
rename to Tests/AK/TestAnyOf.cpp
diff --git a/AK/Tests/TestArray.cpp b/Tests/AK/TestArray.cpp
similarity index 100%
rename from AK/Tests/TestArray.cpp
rename to Tests/AK/TestArray.cpp
diff --git a/AK/Tests/TestAtomic.cpp b/Tests/AK/TestAtomic.cpp
similarity index 100%
rename from AK/Tests/TestAtomic.cpp
rename to Tests/AK/TestAtomic.cpp
diff --git a/AK/Tests/TestBadge.cpp b/Tests/AK/TestBadge.cpp
similarity index 100%
rename from AK/Tests/TestBadge.cpp
rename to Tests/AK/TestBadge.cpp
diff --git a/AK/Tests/TestBase64.cpp b/Tests/AK/TestBase64.cpp
similarity index 100%
rename from AK/Tests/TestBase64.cpp
rename to Tests/AK/TestBase64.cpp
diff --git a/AK/Tests/TestBinaryHeap.cpp b/Tests/AK/TestBinaryHeap.cpp
similarity index 100%
rename from AK/Tests/TestBinaryHeap.cpp
rename to Tests/AK/TestBinaryHeap.cpp
diff --git a/AK/Tests/TestBinarySearch.cpp b/Tests/AK/TestBinarySearch.cpp
similarity index 100%
rename from AK/Tests/TestBinarySearch.cpp
rename to Tests/AK/TestBinarySearch.cpp
diff --git a/AK/Tests/TestBitCast.cpp b/Tests/AK/TestBitCast.cpp
similarity index 100%
rename from AK/Tests/TestBitCast.cpp
rename to Tests/AK/TestBitCast.cpp
diff --git a/AK/Tests/TestBitmap.cpp b/Tests/AK/TestBitmap.cpp
similarity index 100%
rename from AK/Tests/TestBitmap.cpp
rename to Tests/AK/TestBitmap.cpp
diff --git a/AK/Tests/TestByteBuffer.cpp b/Tests/AK/TestByteBuffer.cpp
similarity index 100%
rename from AK/Tests/TestByteBuffer.cpp
rename to Tests/AK/TestByteBuffer.cpp
diff --git a/AK/Tests/TestChecked.cpp b/Tests/AK/TestChecked.cpp
similarity index 100%
rename from AK/Tests/TestChecked.cpp
rename to Tests/AK/TestChecked.cpp
diff --git a/AK/Tests/TestCircularDeque.cpp b/Tests/AK/TestCircularDeque.cpp
similarity index 100%
rename from AK/Tests/TestCircularDeque.cpp
rename to Tests/AK/TestCircularDeque.cpp
diff --git a/AK/Tests/TestCircularDuplexStream.cpp b/Tests/AK/TestCircularDuplexStream.cpp
similarity index 100%
rename from AK/Tests/TestCircularDuplexStream.cpp
rename to Tests/AK/TestCircularDuplexStream.cpp
diff --git a/AK/Tests/TestCircularQueue.cpp b/Tests/AK/TestCircularQueue.cpp
similarity index 100%
rename from AK/Tests/TestCircularQueue.cpp
rename to Tests/AK/TestCircularQueue.cpp
diff --git a/AK/Tests/TestComplex.cpp b/Tests/AK/TestComplex.cpp
similarity index 100%
rename from AK/Tests/TestComplex.cpp
rename to Tests/AK/TestComplex.cpp
diff --git a/AK/Tests/TestDistinctNumeric.cpp b/Tests/AK/TestDistinctNumeric.cpp
similarity index 100%
rename from AK/Tests/TestDistinctNumeric.cpp
rename to Tests/AK/TestDistinctNumeric.cpp
diff --git a/AK/Tests/TestDoublyLinkedList.cpp b/Tests/AK/TestDoublyLinkedList.cpp
similarity index 100%
rename from AK/Tests/TestDoublyLinkedList.cpp
rename to Tests/AK/TestDoublyLinkedList.cpp
diff --git a/AK/Tests/TestEndian.cpp b/Tests/AK/TestEndian.cpp
similarity index 100%
rename from AK/Tests/TestEndian.cpp
rename to Tests/AK/TestEndian.cpp
diff --git a/AK/Tests/TestEnumBits.cpp b/Tests/AK/TestEnumBits.cpp
similarity index 100%
rename from AK/Tests/TestEnumBits.cpp
rename to Tests/AK/TestEnumBits.cpp
diff --git a/AK/Tests/TestFind.cpp b/Tests/AK/TestFind.cpp
similarity index 100%
rename from AK/Tests/TestFind.cpp
rename to Tests/AK/TestFind.cpp
diff --git a/AK/Tests/TestFormat.cpp b/Tests/AK/TestFormat.cpp
similarity index 100%
rename from AK/Tests/TestFormat.cpp
rename to Tests/AK/TestFormat.cpp
diff --git a/AK/Tests/TestGenericLexer.cpp b/Tests/AK/TestGenericLexer.cpp
similarity index 100%
rename from AK/Tests/TestGenericLexer.cpp
rename to Tests/AK/TestGenericLexer.cpp
diff --git a/AK/Tests/TestHashFunctions.cpp b/Tests/AK/TestHashFunctions.cpp
similarity index 100%
rename from AK/Tests/TestHashFunctions.cpp
rename to Tests/AK/TestHashFunctions.cpp
diff --git a/AK/Tests/TestHashMap.cpp b/Tests/AK/TestHashMap.cpp
similarity index 100%
rename from AK/Tests/TestHashMap.cpp
rename to Tests/AK/TestHashMap.cpp
diff --git a/AK/Tests/TestHashTable.cpp b/Tests/AK/TestHashTable.cpp
similarity index 100%
rename from AK/Tests/TestHashTable.cpp
rename to Tests/AK/TestHashTable.cpp
diff --git a/AK/Tests/TestHex.cpp b/Tests/AK/TestHex.cpp
similarity index 100%
rename from AK/Tests/TestHex.cpp
rename to Tests/AK/TestHex.cpp
diff --git a/AK/Tests/TestIPv4Address.cpp b/Tests/AK/TestIPv4Address.cpp
similarity index 100%
rename from AK/Tests/TestIPv4Address.cpp
rename to Tests/AK/TestIPv4Address.cpp
diff --git a/AK/Tests/TestIndexSequence.cpp b/Tests/AK/TestIndexSequence.cpp
similarity index 100%
rename from AK/Tests/TestIndexSequence.cpp
rename to Tests/AK/TestIndexSequence.cpp
diff --git a/AK/Tests/TestIntrusiveList.cpp b/Tests/AK/TestIntrusiveList.cpp
similarity index 100%
rename from AK/Tests/TestIntrusiveList.cpp
rename to Tests/AK/TestIntrusiveList.cpp
diff --git a/AK/Tests/TestIntrusiveRedBlackTree.cpp b/Tests/AK/TestIntrusiveRedBlackTree.cpp
similarity index 100%
rename from AK/Tests/TestIntrusiveRedBlackTree.cpp
rename to Tests/AK/TestIntrusiveRedBlackTree.cpp
diff --git a/AK/Tests/TestJSON.cpp b/Tests/AK/TestJSON.cpp
similarity index 100%
rename from AK/Tests/TestJSON.cpp
rename to Tests/AK/TestJSON.cpp
diff --git a/AK/Tests/TestLexicalPath.cpp b/Tests/AK/TestLexicalPath.cpp
similarity index 100%
rename from AK/Tests/TestLexicalPath.cpp
rename to Tests/AK/TestLexicalPath.cpp
diff --git a/AK/Tests/TestMACAddress.cpp b/Tests/AK/TestMACAddress.cpp
similarity index 100%
rename from AK/Tests/TestMACAddress.cpp
rename to Tests/AK/TestMACAddress.cpp
diff --git a/AK/Tests/TestMemMem.cpp b/Tests/AK/TestMemMem.cpp
similarity index 100%
rename from AK/Tests/TestMemMem.cpp
rename to Tests/AK/TestMemMem.cpp
diff --git a/AK/Tests/TestMemoryStream.cpp b/Tests/AK/TestMemoryStream.cpp
similarity index 100%
rename from AK/Tests/TestMemoryStream.cpp
rename to Tests/AK/TestMemoryStream.cpp
diff --git a/AK/Tests/TestNeverDestroyed.cpp b/Tests/AK/TestNeverDestroyed.cpp
similarity index 100%
rename from AK/Tests/TestNeverDestroyed.cpp
rename to Tests/AK/TestNeverDestroyed.cpp
diff --git a/AK/Tests/TestNonnullRefPtr.cpp b/Tests/AK/TestNonnullRefPtr.cpp
similarity index 100%
rename from AK/Tests/TestNonnullRefPtr.cpp
rename to Tests/AK/TestNonnullRefPtr.cpp
diff --git a/AK/Tests/TestNumberFormat.cpp b/Tests/AK/TestNumberFormat.cpp
similarity index 100%
rename from AK/Tests/TestNumberFormat.cpp
rename to Tests/AK/TestNumberFormat.cpp
diff --git a/AK/Tests/TestOptional.cpp b/Tests/AK/TestOptional.cpp
similarity index 100%
rename from AK/Tests/TestOptional.cpp
rename to Tests/AK/TestOptional.cpp
diff --git a/AK/Tests/TestQueue.cpp b/Tests/AK/TestQueue.cpp
similarity index 100%
rename from AK/Tests/TestQueue.cpp
rename to Tests/AK/TestQueue.cpp
diff --git a/AK/Tests/TestQuickSort.cpp b/Tests/AK/TestQuickSort.cpp
similarity index 100%
rename from AK/Tests/TestQuickSort.cpp
rename to Tests/AK/TestQuickSort.cpp
diff --git a/AK/Tests/TestRedBlackTree.cpp b/Tests/AK/TestRedBlackTree.cpp
similarity index 100%
rename from AK/Tests/TestRedBlackTree.cpp
rename to Tests/AK/TestRedBlackTree.cpp
diff --git a/AK/Tests/TestRefPtr.cpp b/Tests/AK/TestRefPtr.cpp
similarity index 100%
rename from AK/Tests/TestRefPtr.cpp
rename to Tests/AK/TestRefPtr.cpp
diff --git a/AK/Tests/TestSinglyLinkedList.cpp b/Tests/AK/TestSinglyLinkedList.cpp
similarity index 100%
rename from AK/Tests/TestSinglyLinkedList.cpp
rename to Tests/AK/TestSinglyLinkedList.cpp
diff --git a/AK/Tests/TestSourceGenerator.cpp b/Tests/AK/TestSourceGenerator.cpp
similarity index 100%
rename from AK/Tests/TestSourceGenerator.cpp
rename to Tests/AK/TestSourceGenerator.cpp
diff --git a/AK/Tests/TestSourceLocation.cpp b/Tests/AK/TestSourceLocation.cpp
similarity index 100%
rename from AK/Tests/TestSourceLocation.cpp
rename to Tests/AK/TestSourceLocation.cpp
diff --git a/AK/Tests/TestSpan.cpp b/Tests/AK/TestSpan.cpp
similarity index 100%
rename from AK/Tests/TestSpan.cpp
rename to Tests/AK/TestSpan.cpp
diff --git a/AK/Tests/TestString.cpp b/Tests/AK/TestString.cpp
similarity index 100%
rename from AK/Tests/TestString.cpp
rename to Tests/AK/TestString.cpp
diff --git a/AK/Tests/TestStringUtils.cpp b/Tests/AK/TestStringUtils.cpp
similarity index 100%
rename from AK/Tests/TestStringUtils.cpp
rename to Tests/AK/TestStringUtils.cpp
diff --git a/AK/Tests/TestStringView.cpp b/Tests/AK/TestStringView.cpp
similarity index 100%
rename from AK/Tests/TestStringView.cpp
rename to Tests/AK/TestStringView.cpp
diff --git a/AK/Tests/TestTime.cpp b/Tests/AK/TestTime.cpp
similarity index 100%
rename from AK/Tests/TestTime.cpp
rename to Tests/AK/TestTime.cpp
diff --git a/AK/Tests/TestTrie.cpp b/Tests/AK/TestTrie.cpp
similarity index 100%
rename from AK/Tests/TestTrie.cpp
rename to Tests/AK/TestTrie.cpp
diff --git a/AK/Tests/TestTypeTraits.cpp b/Tests/AK/TestTypeTraits.cpp
similarity index 100%
rename from AK/Tests/TestTypeTraits.cpp
rename to Tests/AK/TestTypeTraits.cpp
diff --git a/AK/Tests/TestTypedTransfer.cpp b/Tests/AK/TestTypedTransfer.cpp
similarity index 100%
rename from AK/Tests/TestTypedTransfer.cpp
rename to Tests/AK/TestTypedTransfer.cpp
diff --git a/AK/Tests/TestURL.cpp b/Tests/AK/TestURL.cpp
similarity index 100%
rename from AK/Tests/TestURL.cpp
rename to Tests/AK/TestURL.cpp
diff --git a/AK/Tests/TestUtf8.cpp b/Tests/AK/TestUtf8.cpp
similarity index 100%
rename from AK/Tests/TestUtf8.cpp
rename to Tests/AK/TestUtf8.cpp
diff --git a/AK/Tests/TestVariant.cpp b/Tests/AK/TestVariant.cpp
similarity index 100%
rename from AK/Tests/TestVariant.cpp
rename to Tests/AK/TestVariant.cpp
diff --git a/AK/Tests/TestVector.cpp b/Tests/AK/TestVector.cpp
similarity index 100%
rename from AK/Tests/TestVector.cpp
rename to Tests/AK/TestVector.cpp
diff --git a/AK/Tests/TestWeakPtr.cpp b/Tests/AK/TestWeakPtr.cpp
similarity index 100%
rename from AK/Tests/TestWeakPtr.cpp
rename to Tests/AK/TestWeakPtr.cpp
diff --git a/AK/Tests/test.frm b/Tests/AK/test.frm
similarity index 100%
rename from AK/Tests/test.frm
rename to Tests/AK/test.frm
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 245fb76ee92..5ecb315092e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(AK)
 add_subdirectory(Kernel)
 add_subdirectory(LibC)
 add_subdirectory(LibGfx)