diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index e050c6b9c2b..c10bcd3b1f5 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -354,7 +354,7 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
 include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake)
 cgal_setup_module_path()
 
-if(RUNNING_CGAL_AUTO_TEST)
+if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
   message(STATUS "Operating system:")
   execute_process(
     COMMAND uname -a
@@ -394,7 +394,7 @@ if(MSVC)
   )# Suppress warnings C4503 about "decorated name length exceeded"
   uniquely_add_flags(CGAL_CXX_FLAGS "/bigobj") # Use /bigobj by default
 
-  if(RUNNING_CGAL_AUTO_TEST)
+  if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
     set(CMAKE_CXX_WARNING_LEVEL
         2
         CACHE STRING "MSVC C++ compiler warning level" FORCE)
@@ -447,7 +447,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 
   if(GCC_FOUND)
 
-    if(RUNNING_CGAL_AUTO_TEST)
+    if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
       uniquely_add_flags(CGAL_CXX_FLAGS "-Wall")
       # Remove -g from the relevant CMAKE_CXX_FLAGS. This will also
       # propagate to the rest of the tests, since we overwrite those
@@ -484,7 +484,7 @@ message("== Generate version files (DONE) ==\n")
 #
 #--------------------------------------------------------------------------------------------------
 
-if(CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST)
+if(CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
   message("== Set up flags ==")
 
   # Ugly hack to be compatible with current CGAL testsuite process (as of
@@ -842,7 +842,7 @@ endmacro()
 # This allows programs to locate CGALConfig.cmake
 set(CGAL_DIR ${CGAL_BINARY_DIR})
 
-if(NOT RUNNING_CGAL_AUTO_TEST)
+if(NOT RUNNING_CGAL_AUTO_TEST AND NOT CGAL_TEST_SUITE)
 
   add_programs(examples examples OFF)
   add_programs(demo demos OFF)
@@ -1258,4 +1258,4 @@ if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
   if(Qt5_FOUND)
     message(STATUS "USING Qt5_VERSION = '${Qt5Core_VERSION_STRING}'")
   endif()#Qt5_FOUND
-endif()#RUNNING_CGAL_AUTO_TEST
+endif()#RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE
diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake
index c9c61644d23..d6026c6cdf0 100644
--- a/Installation/cmake/modules/CGAL_Common.cmake
+++ b/Installation/cmake/modules/CGAL_Common.cmake
@@ -4,7 +4,7 @@ option(CGAL_DEV_MODE
   "Activate the CGAL developers mode. See https://github.com/CGAL/cgal/wiki/CGAL_DEV_MODE"
   $ENV{CGAL_DEV_MODE})
 
-if(RUNNING_CGAL_AUTO_TEST)
+if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
 # Just to avoid a warning from CMake if that variable is set on the command line...
 endif()
 
diff --git a/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake b/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
index cb16e161fc7..da1f1d7a268 100644
--- a/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
+++ b/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
@@ -152,7 +152,7 @@ function(CGAL_setup_CGAL_dependencies target)
       "-features=extensions;-library=stlport4;-D_GNU_SOURCE")
     target_link_libraries(${target} INTERFACE "-library=stlport4")
   elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    if ( RUNNING_CGAL_AUTO_TEST )
+    if ( RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
       target_compile_options(${target} INTERFACE "-Wall")
     endif()
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3)
diff --git a/Installation/cmake/modules/CGAL_SetupFlags.cmake b/Installation/cmake/modules/CGAL_SetupFlags.cmake
index 514ad5c58c8..3693e29724e 100644
--- a/Installation/cmake/modules/CGAL_SetupFlags.cmake
+++ b/Installation/cmake/modules/CGAL_SetupFlags.cmake
@@ -46,7 +46,7 @@ uniquely_add_flags( CMAKE_EXE_LINKER_FLAGS_DEBUG      ${CGAL_EXE_LINKER_FLAGS_DE
 
 # Set a default build type if none is given
 if ( NOT CMAKE_BUILD_TYPE )
-  if( RUNNING_CGAL_AUTO_TEST )
+  if( RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
     typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE Debug   )
   else ()
     typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE Release )
diff --git a/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake b/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
index 5909d3fc525..9710c8dbd90 100644
--- a/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
+++ b/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
@@ -90,7 +90,7 @@ function(CGAL_run_at_the_end_of_configuration variable access value current_list
   if(DEFINED CMAKE_BUILD_TYPE AND ( NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "Debug") )
     set(keyword WARNING)
     set(type warning)
-    if(RUNNING_CGAL_AUTO_TEST)
+    if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
       # No warning in the CMake test suite, but a status message
       set(keyword)
       set(type notice)
diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake
index 4d44ca90219..43449b85e51 100644
--- a/Installation/cmake/modules/UseCGAL.cmake
+++ b/Installation/cmake/modules/UseCGAL.cmake
@@ -13,7 +13,7 @@ if(NOT USE_CGAL_FILE_INCLUDED)
   set(USE_CGAL_FILE_INCLUDED 1)
 
   include(${CMAKE_CURRENT_LIST_DIR}/CGAL_Common.cmake)
-  if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST )
+  if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
     include(${CMAKE_CURRENT_LIST_DIR}/CGAL_SetupFlags.cmake)
   else()
     include(${CMAKE_CURRENT_LIST_DIR}/CGAL_display_flags.cmake)
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
index 6edefb1810f..6f72b2cc2e4 100644
--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
@@ -89,7 +89,7 @@ if (NOT CGAL_DATA_DIR)
           if (EXISTS "${CMAKE_SOURCE_DIR}/../../data")
               set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/../../data")
           else()
-            if(CGAL_TEST_SUITE)
+            if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
               message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()")
             endif()
           endif()
@@ -195,7 +195,7 @@ cgal_setup_module_path()
 set(CGAL_USE_FILE ${CGAL_MODULES_DIR}/UseCGAL.cmake)
 include(${CGAL_MODULES_DIR}/CGAL_target_use_TBB.cmake)
 
-if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST )
+if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
   # Do not use -isystem for CGAL include paths
   set(CMAKE_NO_SYSTEM_FROM_IMPORTED TRUE)
 endif()
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt
index a903de94ce5..bce67cbef7f 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(
   COMPONENTS OpenGL Script Svg
   OPTIONAL_COMPONENTS ScriptTools WebSockets)
 
-if(RUNNING_CGAL_AUTO_TEST)
+if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
   if(Qt5_FOUND)
     include(${CGAL_USE_FILE})
   endif()
diff --git a/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt b/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt
index ae9419d4515..3beb5b93cd8 100644
--- a/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt
+++ b/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt
@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.1...3.22)
 project(Set_movable_separability_2_Tests)
 
-if(RUNNING_CGAL_AUTO_TEST)
+if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
   # Just to avoid a warning from CMake when that variable is set on the command line...
 endif()
 if(CGAL_DIR)
diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
index 5477ae22041..02e14ed5b1b 100644
--- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
+++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
@@ -11,7 +11,7 @@ if(CGAL_ImageIO_FOUND)
   create_single_source_cgal_program("mesh_an_implicit_function.cpp")
 
 else()
-  if(RUNNING_CGAL_AUTO_TEST)
+  if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
     # Just to avoid a warning from CMake if that variable is set on the command line...
   endif()
 
diff --git a/Three/doc/Three/Three.txt b/Three/doc/Three/Three.txt
index 99a29c67242..de50c0a1d09 100644
--- a/Three/doc/Three/Three.txt
+++ b/Three/doc/Three/Three.txt
@@ -392,7 +392,7 @@ Notice that an external plugin will not be automatically loaded in the Polyhedro
 
 
 \section example Examples
-All the examples are de-activated in the cmake list outside of our testsuite. To tesr them, one must add `-DRUNNING_CGAL_AUTO_TEST=ON` to the cmake call.
+All the examples are de-activated in the cmake list outside of our testsuite. To test them, one must add `-DCGAL_TEST_SUITE=ON` to the cmake call.
 \subsection example1 Creating a Basic Plugin
 \cgalExample{Three_examples/Basic_plugin.cpp}