diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
index 7bf32e47fa5..08ebf9426c0 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
@@ -873,6 +873,10 @@ endfunction()
 #---------------------------------------------------------------------#
 function(test_polycurve_conic_traits)
 #  echo polycurve test starting
+  if($ENV{CGAL_DISABLE_GMP})
+    MESSAGE(STATUS "test_polycurve_conic_traits requires CORE and will not be executed")
+    return()
+  endif()
   set(nt ${CORE_EXPR_NT})
   set(kernel ${CARTESIAN_KERNEL})
   set(geom_traits ${POLYCURVE_CONIC_GEOM_TRAITS})
@@ -940,6 +944,10 @@ endfunction()
 # polycurve bezier traits
 #---------------------------------------------------------------------#
 function(test_polycurve_bezier_traits)
+  if($ENV{CGAL_DISABLE_GMP})
+    MESSAGE(STATUS "test_polycurve_bezier_traits requires CORE and will not be executed")
+    return()
+  endif()
   set(nt ${CORE_EXPR_NT})
   set(kernel ${CARTESIAN_KERNEL})
   set(geom_traits ${POLYCURVE_BEZIER_GEOM_TRAITS})
@@ -1045,6 +1053,10 @@ endfunction()
 # conic traits
 #---------------------------------------------------------------------#
 function(test_conic_traits)
+  if($ENV{CGAL_DISABLE_GMP})
+    MESSAGE(STATUS "test_conic_traits requires CORE and will not be executed")
+    return()
+  endif()
   set(nt ${CORE_EXPR_NT})
   set(kernel ${CARTESIAN_KERNEL})
   set(geom_traits ${CORE_CONIC_GEOM_TRAITS})
@@ -1172,6 +1184,10 @@ endfunction()
 # bezier traits
 #---------------------------------------------------------------------#
 function(test_bezier_traits)
+  if($ENV{CGAL_DISABLE_GMP})
+    MESSAGE(STATUS "test_bezier_traits requires CORE and will not be executed")
+    return()
+  endif()
   set(nt ${CORE_EXPR_NT})
   set(kernel ${CARTESIAN_KERNEL})
   set(geom_traits ${BEZIER_GEOM_TRAITS})
@@ -1215,6 +1231,10 @@ endfunction()
 # rational arc traits
 #---------------------------------------------------------------------#
 function(test_rational_arc_traits)
+  if($ENV{CGAL_DISABLE_GMP})
+    MESSAGE(STATUS "test_rational_arc_traits requires CORE and will not be executed")
+    return()
+  endif()
   set(nt ${CORE_INT_NT})
   set(kernel ${UNIVARIATE_ALGEBRAIC_KERNEL})
   set(geom_traits ${RATIONAL_ARC_GEOM_TRAITS})
@@ -1275,7 +1295,10 @@ endfunction()
 #---------------------------------------------------------------------#
 function(test_algebraic_traits_core)
   #TODO: Adapt
-
+  if($ENV{CGAL_DISABLE_GMP})
+    MESSAGE(STATUS "test_algebraic_traits_core requires CORE and will not be executed")
+    return()
+  endif()
   set(nt ${CORE_INT_NT})
   set(kernel ${UNIVARIATE_ALGEBRAIC_KERNEL})
   set(geom_traits ${ALGEBRAIC_GEOM_TRAITS})
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
index c330edd7f48..19c67f8dd10 100755
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
@@ -1101,6 +1101,10 @@ test_non_caching_segment_traits()
 #---------------------------------------------------------------------#
 test_polycurve_conic_traits()
 {
+  if [ -n "${CGAL_DISABLE_GMP}" ]; then
+    echo "CORE is not available, test_polycurve_conic_traits not ran"
+    return
+  fi
   echo polycurve test starting
   local nt=$CORE_EXPR_NT;
   local kernel=$CARTESIAN_KERNEL;
@@ -1181,6 +1185,10 @@ test_polycurve_circular_arc_traits()
 #---------------------------------------------------------------------#
 test_polycurve_bezier_traits()
 {
+  if [ -n "${CGAL_DISABLE_GMP}" ]; then
+    echo "CORE is not available, test_polycurve_bezier_traits not ran"
+    return
+  fi
   local nt=$CORE_EXPR_NT;
   local kernel=$CARTESIAN_KERNEL;
   local geom_traits=$POLYCURVE_BEZIER_GEOM_TRAITS;
@@ -1306,6 +1314,10 @@ test_linear_traits()
 #---------------------------------------------------------------------#
 test_conic_traits()
 {
+  if [ -n "${CGAL_DISABLE_GMP}" ]; then
+    echo "CORE is not available, test_conic_traits not ran"
+    return
+  fi
   local nt=$CORE_EXPR_NT;
   local kernel=$CARTESIAN_KERNEL;
   local geom_traits=$CORE_CONIC_GEOM_TRAITS;
@@ -1458,6 +1470,10 @@ test_circle_segments_traits()
 #---------------------------------------------------------------------#
 test_bezier_traits()
 {
+  if [ -n "${CGAL_DISABLE_GMP}" ]; then
+    echo "CORE is not available, test_bezier_traits not ran"
+    return
+  fi
   local nt=$CORE_EXPR_NT;
   local kernel=$CARTESIAN_KERNEL;
   local geom_traits=$BEZIER_GEOM_TRAITS;
@@ -1511,6 +1527,10 @@ test_spherical_arc_traits()
 #---------------------------------------------------------------------#
 test_rational_arc_traits()
 {
+  if [ -n "${CGAL_DISABLE_GMP}" ]; then
+    echo "CORE is not available, test_rational_arc_traits not ran"
+    return
+  fi
   local nt=$CORE_INT_NT;
   local kernel=$UNIVARIATE_ALGEBRAIC_KERNEL;
   local geom_traits=$RATIONAL_ARC_GEOM_TRAITS;
@@ -1586,7 +1606,10 @@ test_algebraic_traits_leda()
 test_algebraic_traits_core()
 {
   #TODO: Adapt
-
+  if [ -n "${CGAL_DISABLE_GMP}" ]; then
+    echo "CORE is not available, test_algebraic_traits_core not ran"
+    return
+  fi
   local nt=$CORE_INT_NT;
   local kernel=$UNIVARIATE_ALGEBRAIC_KERNEL;
   local geom_traits=$ALGEBRAIC_GEOM_TRAITS;