diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 110368542..77190ffb1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,12 @@
 # Boost.Geometry
+
 # Copyright (c) 2024 Barend Gehrels, Amsterdam, the Netherlands.
+
+# This file was modified by Oracle on 2024.
+# Modifications copyright (c) 2024 Oracle and/or its affiliates.
+
+# Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
@@ -48,16 +55,19 @@ if (NOT TARGET tests)
   add_custom_target(tests)
 endif()
 
-add_subdirectory(core)
-add_subdirectory(concepts)
-add_subdirectory(geometries)
-add_subdirectory(arithmetic)
 add_subdirectory(algorithms)
+add_subdirectory(arithmetic)
+add_subdirectory(concepts)
+add_subdirectory(core)
+add_subdirectory(cs_undefined)
 add_subdirectory(formulas)
-add_subdirectory(iterators)
-add_subdirectory(strategies)
-add_subdirectory(policies)
+add_subdirectory(geometries)
 add_subdirectory(io)
+add_subdirectory(iterators)
+add_subdirectory(policies)
+
 add_subdirectory(srs)
+add_subdirectory(strategies)
+
 add_subdirectory(util)
 add_subdirectory(views)
diff --git a/test/cs_undefined/CMakeLists.txt b/test/cs_undefined/CMakeLists.txt
new file mode 100644
index 000000000..e6846f165
--- /dev/null
+++ b/test/cs_undefined/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Boost.Geometry
+# Copyright (c) 2024, Oracle and/or its affiliates.
+# Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+foreach(item IN ITEMS
+    distance
+    envelope_expand
+    index
+    is
+    measure
+    other
+    relops1
+    relops2
+    setops1
+    setops2
+  )
+  boost_geometry_add_unit_test("cs_undefined" ${item})
+endforeach()
\ No newline at end of file