diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 77190ffb1f..1800f64de4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -65,7 +65,7 @@ add_subdirectory(geometries)
 add_subdirectory(io)
 add_subdirectory(iterators)
 add_subdirectory(policies)
-
+add_subdirectory(robustness)
 add_subdirectory(srs)
 add_subdirectory(strategies)
 
diff --git a/test/robustness/CMakeLists.txt b/test/robustness/CMakeLists.txt
new file mode 100644
index 0000000000..6b4a56f4e0
--- /dev/null
+++ b/test/robustness/CMakeLists.txt
@@ -0,0 +1,10 @@
+# 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)
+
+add_subdirectory(convex_hull)
+add_subdirectory(overlay)
+#add_subdirectory(within)
\ No newline at end of file
diff --git a/test/robustness/convex_hull/CMakeLists.txt b/test/robustness/convex_hull/CMakeLists.txt
new file mode 100644
index 0000000000..f47b895eca
--- /dev/null
+++ b/test/robustness/convex_hull/CMakeLists.txt
@@ -0,0 +1,12 @@
+# 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
+    random_multi_points
+  )
+  boost_geometry_add_unit_test("robustness" ${item})
+endforeach()
\ No newline at end of file
diff --git a/test/robustness/overlay/CMakeLists.txt b/test/robustness/overlay/CMakeLists.txt
new file mode 100644
index 0000000000..cbe25c9e76
--- /dev/null
+++ b/test/robustness/overlay/CMakeLists.txt
@@ -0,0 +1,10 @@
+# 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)
+
+add_subdirectory(areal_areal)
+add_subdirectory(buffer)
+add_subdirectory(linear_areal)
\ No newline at end of file
diff --git a/test/robustness/overlay/areal_areal/CMakeLists.txt b/test/robustness/overlay/areal_areal/CMakeLists.txt
new file mode 100644
index 0000000000..1ae0042526
--- /dev/null
+++ b/test/robustness/overlay/areal_areal/CMakeLists.txt
@@ -0,0 +1,20 @@
+# 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
+    general_intersection_precision
+    interior_triangles
+    intersection_pies
+    intersection_stars
+    intersects
+    random_ellipses_stars
+    recursive_polygons
+    star_comb
+    ticket_9081
+  )
+  boost_geometry_add_unit_test("robustness" ${item})
+endforeach()
\ No newline at end of file
diff --git a/test/robustness/overlay/buffer/CMakeLists.txt b/test/robustness/overlay/buffer/CMakeLists.txt
new file mode 100644
index 0000000000..92b0ec3919
--- /dev/null
+++ b/test/robustness/overlay/buffer/CMakeLists.txt
@@ -0,0 +1,14 @@
+# 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
+    many_ring_buffer
+    multi_point_growth
+    recursive_polygons_buffer
+  )
+  boost_geometry_add_unit_test("robustness" ${item})
+endforeach()
\ No newline at end of file
diff --git a/test/robustness/overlay/linear_areal/CMakeLists.txt b/test/robustness/overlay/linear_areal/CMakeLists.txt
new file mode 100644
index 0000000000..fc3cfa2201
--- /dev/null
+++ b/test/robustness/overlay/linear_areal/CMakeLists.txt
@@ -0,0 +1,8 @@
+# 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)
+
+boost_geometry_add_unit_test("robustness" recursive_polygons_linear_areal)
\ No newline at end of file