diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index ed517a14ac..621591d291 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -93,9 +93,12 @@ jobs:
 
       - name: Build tests with cmake
         run: |
+          cd __build
           rm -rf *
           cmake -DBUILD_TESTING=ON ..
           cmake --build . --target tests
 
       - name: Run tests
+        run: |
+          cd __build
           ctest --output-on-failure --no-tests=error
diff --git a/index/test/CMakeLists.txt b/index/test/CMakeLists.txt
new file mode 100644
index 0000000000..755fcc47cc
--- /dev/null
+++ b/index/test/CMakeLists.txt
@@ -0,0 +1,17 @@
+# 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
+    minmax_heap
+    varray_old
+    varray
+  )
+  boost_geometry_add_unit_test("index" ${item})
+endforeach()
+
+add_subdirectory(algorithms)
+add_subdirectory(rtree)
\ No newline at end of file
diff --git a/index/test/algorithms/CMakeLists.txt b/index/test/algorithms/CMakeLists.txt
new file mode 100644
index 0000000000..15f808bb58
--- /dev/null
+++ b/index/test/algorithms/CMakeLists.txt
@@ -0,0 +1,19 @@
+# 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
+    content
+    intersection_content # this tests overlap() too
+    is_valid
+    margin
+    #minmaxdist
+    union_content
+    segment_intersection
+    path_intersection
+  )
+  boost_geometry_add_unit_test("index" ${item})
+endforeach()
\ No newline at end of file
diff --git a/index/test/rtree/CMakeLists.txt b/index/test/rtree/CMakeLists.txt
new file mode 100644
index 0000000000..0df65b6b11
--- /dev/null
+++ b/index/test/rtree/CMakeLists.txt
@@ -0,0 +1,19 @@
+# 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
+    rtree_contains_point
+    rtree_epsilon
+    rtree_insert_remove
+    rtree_intersects_geom
+    rtree_move_pack
+    rtree_non_cartesian
+    rtree_values
+    #compile-fail rtree_values_invalid
+  )
+  boost_geometry_add_unit_test("index" ${item})
+endforeach()
\ No newline at end of file