diff --git a/Installation/cmake/modules/CGAL_add_test.cmake b/Installation/cmake/modules/CGAL_add_test.cmake
index a86003363f9..e7d6ee42564 100644
--- a/Installation/cmake/modules/CGAL_add_test.cmake
+++ b/Installation/cmake/modules/CGAL_add_test.cmake
@@ -40,11 +40,11 @@ if(CGAL_CTEST_DISPLAY_MEM_AND_TIME)
 endif()
 
 if(ANDROID)
-  set(ANDROID_DIR_PREFIX /data/local/tmp/)
+  set(CGAL_REMOTE_TEST_DIR_PREFIX /data/local/tmp/ CACHE PATH "Path to the directory where the tests will be executed in a remote testsuite.")
   find_program(adb_executable adb)
 endif()
-if(SSH)
-  set(SSH_DIR_PREFIX /home/pi/CGAL/)
+if(CGAL_RUN_TESTS_THROUGH_SSH)
+  set(CGAL_REMOTE_TEST_DIR_PREFIX /home/pi/CGAL/ CACHE PATH "Path to the directory where the tests will be executed in a remote testsuite."))
   find_program(ssh_executable ssh)
   find_program(scp_executable scp)
 endif()
@@ -121,24 +121,24 @@ function(cgal_setup_test_properties test_name)
           COMMAND
           ${adb_executable} push
           ${CMAKE_CURRENT_SOURCE_DIR}
-          ${ANDROID_DIR_PREFIX}${PROJECT_NAME}
+          ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}
           )
         add_test(NAME ${PROJECT_NAME}_copy_GMP_MPFR
           COMMAND
           ${adb_executable} push
           ${GMP_LIBRARIES} ${MPFR_LIBRARIES}
-          ${ANDROID_DIR_PREFIX}${PROJECT_NAME}
+          ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}
           )
         set_property(TEST ${PROJECT_NAME}_copy_GMP_MPFR
           APPEND PROPERTY DEPENDS ${PROJECT_NAME}_SetupFixture)
         set_property(TEST ${PROJECT_NAME}_copy_GMP_MPFR
           PROPERTY FIXTURES_SETUP ${PROJECT_NAME})
-      elseif(SSH)
+      elseif(CGAL_RUN_TESTS_THROUGH_SSH)
         add_test(NAME ${PROJECT_NAME}_SetupFixture
           COMMAND
           ${scp_executable} -r
           ${CMAKE_CURRENT_SOURCE_DIR}
-          ${SSH_HOST}:${SSH_DIR_PREFIX}${PROJECT_NAME}
+          ${SSH_HOST}:${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}
           )
       else()
         add_test(NAME ${PROJECT_NAME}_SetupFixture
@@ -155,13 +155,13 @@ function(cgal_setup_test_properties test_name)
         add_test(NAME ${PROJECT_NAME}_CleanupFixture
           COMMAND
           ${adb_executable} shell rm -rf
-          ${ANDROID_DIR_PREFIX}${PROJECT_NAME}
+          ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}
           )
-      elseif(SSH)
+      elseif(CGAL_RUN_TESTS_THROUGH_SSH)
         add_test(NAME ${PROJECT_NAME}_CleanupFixture
           COMMAND
           ${ssh_executable} ${SSH_HOST} rm -rf
-          ${SSH_DIR_PREFIX}${PROJECT_NAME}
+          ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}
           )
       else()
         add_test(NAME ${PROJECT_NAME}_CleanupFixture
@@ -177,7 +177,7 @@ function(cgal_setup_test_properties test_name)
         ${PROJECT_NAME}_CleanupFixture ${PROJECT_NAME}_SetupFixture
         APPEND PROPERTY LABELS "${PROJECT_NAME}")
     endif()
-    if(NOT ANDROID AND NOT SSH)
+    if(NOT ANDROID AND NOT CGAL_RUN_TESTS_THROUGH_SSH)
       set_property(TEST "${test_name}"
         PROPERTY
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/__exec_test_dir)
@@ -190,13 +190,13 @@ function(cgal_setup_test_properties test_name)
         APPEND PROPERTY FIXTURES_REQUIRED "${exe_name}")
       set_property(TEST "compilation_of__${exe_name}"
         PROPERTY FIXTURES_SETUP "${exe_name}")
-      if((ANDROID OR SSH) AND NOT TEST push_of__${exe_name})
+      if((ANDROID OR CGAL_RUN_TESTS_THROUGH_SSH) AND NOT TEST push_of__${exe_name})
         if(ANDROID)
           add_test(NAME "push_of__${exe_name}"
-            COMMAND ${adb_executable} push $<TARGET_FILE:${exe_name}> ${ANDROID_DIR_PREFIX}${PROJECT_NAME}/${exe_name})
-        elseif(SSH)
+            COMMAND ${adb_executable} push $<TARGET_FILE:${exe_name}> ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}/${exe_name})
+        elseif(CGAL_RUN_TESTS_THROUGH_SSH)
           add_test(NAME "push_of__${exe_name}"
-            COMMAND ${scp_executable} $<TARGET_FILE:${exe_name}> ${SSH_HOST}:${SSH_DIR_PREFIX}${PROJECT_NAME}/)
+            COMMAND ${scp_executable} $<TARGET_FILE:${exe_name}> ${SSH_HOST}:${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}/)
         endif()
         set_property(TEST "push_of__${exe_name}"
           APPEND PROPERTY DEPENDS "compilation_of__${exe_name}")
@@ -232,7 +232,7 @@ function(cgal_add_test exe_name)
 #  message("Add test ${test_name}")
   set(cin_file "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cin")
   if(NOT ARGS AND EXISTS ${cin_file})
-    if(ANDROID OR SSH)
+    if(ANDROID OR CGAL_RUN_TESTS_THROUGH_SSH)
       set(cmd ${exe_name})
     else()
       set(cmd $<TARGET_FILE:${exe_name}>)
@@ -241,10 +241,10 @@ function(cgal_add_test exe_name)
       COMMAND ${TIME_COMMAND} ${CMAKE_COMMAND}
       -DCMD:STRING=${cmd}
       -DCIN:STRING=${cin_file}
-      -DANDROID_DIR_PREFIX=${ANDROID_DIR_PREFIX}
+      -DCGAL_REMOTE_TEST_DIR_PREFIX=${CGAL_REMOTE_TEST_DIR_PREFIX}
       -DSSH=${SSH}
       -DSSH_HOST=${SSH_HOST}
-      -DSSH_DIR_PREFIX=${SSH_DIR_PREFIX}
+      -DCGAL_REMOTE_TEST_DIR_PREFIX=${CGAL_REMOTE_TEST_DIR_PREFIX}
       -DPROJECT_NAME=${PROJECT_NAME}
       -P "${CGAL_MODULES_DIR}/run_test_with_cin.cmake")
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -277,10 +277,10 @@ function(cgal_add_test exe_name)
     endif()
     #	message(STATUS "add test: ${exe_name} ${ARGS}")
     if(ANDROID)
-      add_test(NAME ${test_name} COMMAND ${TIME_COMMAND} ${adb_executable} shell cd ${ANDROID_DIR_PREFIX}${PROJECT_NAME} && LD_LIBRARY_PATH=${ANDROID_DIR_PREFIX}${PROJECT_NAME} ${ANDROID_DIR_PREFIX}${PROJECT_NAME}/${exe_name} ${ARGS})
-    elseif(SSH)
+      add_test(NAME ${test_name} COMMAND ${TIME_COMMAND} ${adb_executable} shell cd ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME} && LD_LIBRARY_PATH=${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME} ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}/${exe_name} ${ARGS})
+    elseif(CGAL_RUN_TESTS_THROUGH_SSH)
       STRING(REPLACE ";" " " arg_str "${ARGS}")
-      add_test(NAME ${test_name} COMMAND bash -c "${TIME_COMMAND} ${ssh_executable}  ${SSH_HOST} \"cd ${SSH_DIR_PREFIX}${PROJECT_NAME} && ${SSH_DIR_PREFIX}${PROJECT_NAME}/${exe_name} ${arg_str} 3< <(cat; kill -INT 0)\" <&1")
+      add_test(NAME ${test_name} COMMAND bash -c "${TIME_COMMAND} ${ssh_executable}  ${SSH_HOST} \"cd ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME} && ${CGAL_REMOTE_TEST_DIR_PREFIX}${PROJECT_NAME}/${exe_name} ${arg_str} 3< <(cat; kill -INT 0)\" <&1")
     else()
       add_test(NAME ${test_name} COMMAND ${TIME_COMMAND} $<TARGET_FILE:${exe_name}> ${ARGS})
     endif()
diff --git a/Scripts/developer_scripts/global_run_testsuite.sh b/Scripts/developer_scripts/global_run_testsuite.sh
index 0eec3a6d7ca..d6ca2e3be76 100644
--- a/Scripts/developer_scripts/global_run_testsuite.sh
+++ b/Scripts/developer_scripts/global_run_testsuite.sh
@@ -226,6 +226,8 @@ if [ -z "${USE_LATEST_UNZIPPED}" ]; then
   get_cgal
   unzip_cgal
 fi
+#reset CGAL-DIR with the updated CGAL-I
+CGAL_DIR=`readlink "${CGAL_ROOT}/CGAL-I"`
 CGAL_RELEASE_ID=$(cat last_release_id)
 if [ "${WITH_DOCKER}" = "y" ]; then
   #launch docker container
diff --git a/Scripts/developer_scripts/run_testsuite_with_cmake b/Scripts/developer_scripts/run_testsuite_with_cmake
index 2be3b2884d6..4e27d221a18 100644
--- a/Scripts/developer_scripts/run_testsuite_with_cmake
+++ b/Scripts/developer_scripts/run_testsuite_with_cmake
@@ -7,7 +7,6 @@
 
 source "${CGAL_DIR}/developer_scripts/log.sh"
 # Load settings
-echo "CGAL_ROOT is $CGAL_ROOT"
 if [ -f "$CGAL_ROOT/.autocgalrc" ]; then
   . "$CGAL_ROOT/.autocgalrc"
 else
@@ -255,7 +254,9 @@ run_test_on_host_and_platform()
     cmake ${INIT_FILE:+"-C${INIT_FILE}"} '${CMAKE_GENERATOR}' VERBOSE=1 $CGAL_DIR
   fi
   LIST_TEST_FILE="${CGAL_ROOT}/list_test_packages"
-  LIST_TEST_PACKAGES=$(source ${LIST_TEST_FILE})
+  if [ -f ${LIST_TEST_FILE} ]; then
+    LIST_TEST_PACKAGES=$(source ${LIST_TEST_FILE})
+  fi
   TO_TEST=""
   INIT=""
   for pkg in $LIST_TEST_PACKAGES; do