diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc0060255..750938c0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(boost_geometry
     Boost::concept_check
     Boost::config
     Boost::core
+    Boost::crc
     Boost::function_types
     Boost::iterator
     Boost::lexical_cast
@@ -32,6 +33,7 @@ target_link_libraries(boost_geometry
     Boost::mpl
     Boost::multiprecision
     Boost::numeric_conversion
+    Boost::program_options
     Boost::qvm
     Boost::range
     Boost::rational
@@ -100,9 +102,11 @@ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
           config
           algorithm
           any
+          crc
           lexical_cast
           math
           multiprecision
+          program_options
           qvm
           rational
           serialization
diff --git a/test/robustness/convex_hull/CMakeLists.txt b/test/robustness/convex_hull/CMakeLists.txt
index a3fc51420..09392259d 100644
--- a/test/robustness/convex_hull/CMakeLists.txt
+++ b/test/robustness/convex_hull/CMakeLists.txt
@@ -5,8 +5,9 @@
 # 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()
+boost_geometry_add_unit_test("robustness" random_multi_points)
+
+target_include_directories(boost_geometry_robustness_random_multi_points
+    PRIVATE
+      "${PROJECT_SOURCE_DIR}/test/robustness"
+      .)
diff --git a/test/robustness/overlay/areal_areal/CMakeLists.txt b/test/robustness/overlay/areal_areal/CMakeLists.txt
index 9f39d7221..5c2c0ed62 100644
--- a/test/robustness/overlay/areal_areal/CMakeLists.txt
+++ b/test/robustness/overlay/areal_areal/CMakeLists.txt
@@ -6,7 +6,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 foreach(item IN ITEMS
-    general_intersection_precision
+    #general_intersection_precision
     interior_triangles
     intersection_pies
     intersection_stars
@@ -14,7 +14,11 @@ foreach(item IN ITEMS
     random_ellipses_stars
     recursive_polygons
     star_comb
-    ticket_9081
+    #ticket_9081
   )
   boost_geometry_add_unit_test("robustness" ${item})
+  target_include_directories(boost_geometry_robustness_${item}
+    PRIVATE
+      "${PROJECT_SOURCE_DIR}/test/robustness"
+      .)
 endforeach()
diff --git a/test/robustness/overlay/buffer/CMakeLists.txt b/test/robustness/overlay/buffer/CMakeLists.txt
index a0d15fc94..c45812a11 100644
--- a/test/robustness/overlay/buffer/CMakeLists.txt
+++ b/test/robustness/overlay/buffer/CMakeLists.txt
@@ -6,9 +6,13 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 foreach(item IN ITEMS
-    many_ring_buffer
-    multi_point_growth
+    #many_ring_buffer
+    #multi_point_growth
     recursive_polygons_buffer
   )
   boost_geometry_add_unit_test("robustness" ${item})
+  target_include_directories(boost_geometry_robustness_${item}
+    PRIVATE
+      "${PROJECT_SOURCE_DIR}/test/robustness"
+      .)
 endforeach()