diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0d44e0656..45bab9211 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -381,26 +381,37 @@ SETUP_BASIC_TEST(
 SETUP_BASIC_TEST(
     NAME stl
     SOURCES
-        entt/stl/algorithm.cpp
-        entt/stl/array.cpp
-        entt/stl/atomic.cpp
-        entt/stl/bit.cpp
-        entt/stl/cmath.cpp
-        entt/stl/concepts.cpp
-        entt/stl/cstddef.cpp
-        entt/stl/cstdint.cpp
         entt/stl/functional.cpp
-        entt/stl/ios.cpp
         entt/stl/iterator.cpp
-        entt/stl/limits.cpp
         entt/stl/memory.cpp
-        entt/stl/ostream.cpp
-        entt/stl/sstream.cpp
-        entt/stl/string.cpp
-        entt/stl/string_view.cpp
-        entt/stl/tuple.cpp
-        entt/stl/type_traits.cpp
-        entt/stl/utility.cpp
-        entt/stl/vector.cpp
     DEFS ENTT_USE_STL
 )
+
+# Test stl_ext
+
+SETUP_BASIC_TEST(
+    NAME stl_ext
+    SOURCES
+        entt/stl_ext/algorithm.cpp
+        entt/stl_ext/array.cpp
+        entt/stl_ext/atomic.cpp
+        entt/stl_ext/bit.cpp
+        entt/stl_ext/cmath.cpp
+        entt/stl_ext/concepts.cpp
+        entt/stl_ext/cstddef.cpp
+        entt/stl_ext/cstdint.cpp
+        entt/stl_ext/functional.cpp
+        entt/stl_ext/ios.cpp
+        entt/stl_ext/iterator.cpp
+        entt/stl_ext/limits.cpp
+        entt/stl_ext/memory.cpp
+        entt/stl_ext/ostream.cpp
+        entt/stl_ext/sstream.cpp
+        entt/stl_ext/string.cpp
+        entt/stl_ext/string_view.cpp
+        entt/stl_ext/tuple.cpp
+        entt/stl_ext/type_traits.cpp
+        entt/stl_ext/utility.cpp
+        entt/stl_ext/vector.cpp
+    INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
diff --git a/test/entt/stl/algorithm.cpp b/test/entt/stl_ext/algorithm.cpp
similarity index 100%
rename from test/entt/stl/algorithm.cpp
rename to test/entt/stl_ext/algorithm.cpp
diff --git a/test/entt/stl/array.cpp b/test/entt/stl_ext/array.cpp
similarity index 100%
rename from test/entt/stl/array.cpp
rename to test/entt/stl_ext/array.cpp
diff --git a/test/entt/stl/atomic.cpp b/test/entt/stl_ext/atomic.cpp
similarity index 100%
rename from test/entt/stl/atomic.cpp
rename to test/entt/stl_ext/atomic.cpp
diff --git a/test/entt/stl/bit.cpp b/test/entt/stl_ext/bit.cpp
similarity index 100%
rename from test/entt/stl/bit.cpp
rename to test/entt/stl_ext/bit.cpp
diff --git a/test/entt/stl/cmath.cpp b/test/entt/stl_ext/cmath.cpp
similarity index 100%
rename from test/entt/stl/cmath.cpp
rename to test/entt/stl_ext/cmath.cpp
diff --git a/test/entt/stl/concepts.cpp b/test/entt/stl_ext/concepts.cpp
similarity index 100%
rename from test/entt/stl/concepts.cpp
rename to test/entt/stl_ext/concepts.cpp
diff --git a/test/entt/stl/cstddef.cpp b/test/entt/stl_ext/cstddef.cpp
similarity index 100%
rename from test/entt/stl/cstddef.cpp
rename to test/entt/stl_ext/cstddef.cpp
diff --git a/test/entt/stl/cstdint.cpp b/test/entt/stl_ext/cstdint.cpp
similarity index 100%
rename from test/entt/stl/cstdint.cpp
rename to test/entt/stl_ext/cstdint.cpp
diff --git a/test/entt/stl/ios.cpp b/test/entt/stl_ext/functional.cpp
similarity index 100%
rename from test/entt/stl/ios.cpp
rename to test/entt/stl_ext/functional.cpp
diff --git a/test/entt/stl/limits.cpp b/test/entt/stl_ext/ios.cpp
similarity index 100%
rename from test/entt/stl/limits.cpp
rename to test/entt/stl_ext/ios.cpp
diff --git a/test/entt/stl/ostream.cpp b/test/entt/stl_ext/iterator.cpp
similarity index 100%
rename from test/entt/stl/ostream.cpp
rename to test/entt/stl_ext/iterator.cpp
diff --git a/test/entt/stl/sstream.cpp b/test/entt/stl_ext/limits.cpp
similarity index 100%
rename from test/entt/stl/sstream.cpp
rename to test/entt/stl_ext/limits.cpp
diff --git a/test/entt/stl/string.cpp b/test/entt/stl_ext/memory.cpp
similarity index 100%
rename from test/entt/stl/string.cpp
rename to test/entt/stl_ext/memory.cpp
diff --git a/test/entt/stl/string_view.cpp b/test/entt/stl_ext/ostream.cpp
similarity index 100%
rename from test/entt/stl/string_view.cpp
rename to test/entt/stl_ext/ostream.cpp
diff --git a/test/entt/stl/tuple.cpp b/test/entt/stl_ext/sstream.cpp
similarity index 100%
rename from test/entt/stl/tuple.cpp
rename to test/entt/stl_ext/sstream.cpp
diff --git a/test/entt/stl/type_traits.cpp b/test/entt/stl_ext/string.cpp
similarity index 100%
rename from test/entt/stl/type_traits.cpp
rename to test/entt/stl_ext/string.cpp
diff --git a/test/entt/stl/utility.cpp b/test/entt/stl_ext/string_view.cpp
similarity index 100%
rename from test/entt/stl/utility.cpp
rename to test/entt/stl_ext/string_view.cpp
diff --git a/test/entt/stl/vector.cpp b/test/entt/stl_ext/tuple.cpp
similarity index 100%
rename from test/entt/stl/vector.cpp
rename to test/entt/stl_ext/tuple.cpp
diff --git a/test/entt/stl_ext/type_traits.cpp b/test/entt/stl_ext/type_traits.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/entt/stl_ext/utility.cpp b/test/entt/stl_ext/utility.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/entt/stl_ext/vector.cpp b/test/entt/stl_ext/vector.cpp
new file mode 100644
index 000000000..e69de29bb