diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt
index 2c6c4bb939e..c6508729b32 100644
--- a/Installation/test/Installation/CMakeLists.txt
+++ b/Installation/test/Installation/CMakeLists.txt
@@ -183,7 +183,7 @@ if ( CGAL_BRANCH_BUILD )
     COMMAND ${CMAKE_COMMAND}   -DCGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE=ON -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
       "${CMAKE_CURRENT_BINARY_DIR}/test_config_file"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build-test_config_file_2")
-elseif(CGAL_TEST_SUITE)#CGAL_BRANCH_BUILD
+elseif(RUNNING_CGAL_AUTO_TEST)#CGAL_BRANCH_BUILD
   #test CGAL_DIR = CGAL-5.x/lib/cmake/CGAL
   get_filename_component(CGAL_DIR_CORRECT_PATH "${CGAL_SOURCE_DIR}/lib/cmake/CGAL/CMakeConfig.cmake" DIRECTORY)
   add_test(NAME test_config_file_2
diff --git a/Installation/test/Installation/cgal_test_with_cmake b/Installation/test/Installation/cgal_test_with_cmake
index 199ec5b7d1d..44071897e35 100755
--- a/Installation/test/Installation/cgal_test_with_cmake
+++ b/Installation/test/Installation/cgal_test_with_cmake
@@ -20,7 +20,7 @@ echo "Configuring... "
 mkdir build_dir
 cd build_dir
 if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
-                                   -DCGAL_DIR="$CGAL_DIR" -DBUILD_TESTING=ON -DWITH_tests=ON \
+                                   -DCGAL_DIR="$CGAL_RELEASE_DIR" -DBUILD_TESTING=ON -DWITH_tests=ON \
                                    ..' ; then
 
   echo "   successful configuration" >> $ERRORFILE
diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal
index 0cae40110f4..a1d82dcc6da 100755
--- a/Scripts/developer_scripts/autotest_cgal
+++ b/Scripts/developer_scripts/autotest_cgal
@@ -391,7 +391,7 @@ setup_dirs()
     log "${ACTUAL_LOGFILE}" "Creating ${CGAL_DIR}/cmake/platforms"
   fi
 
-  CGAL_RELEASE_DIR="${CGAL_DIR}"
+  export CGAL_RELEASE_DIR="${CGAL_DIR}"
 
   CGAL_RELEASE_ID=`basename "${CGAL_RELEASE_DIR}"`
 
@@ -666,7 +666,7 @@ EOF
       cat >> "$file" <<EOF
 echo 'COLLECTING RESULTS';
 ./collect_cgal_testresults_from_cmake;
-if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then 
+if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
   echo 'COLLECTING DEMOS BINARIES';
   tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
 fi
@@ -804,7 +804,7 @@ put_on_web()
 # Parse command line arguments
 for arg in "$@"
 do
-  case "$arg" in 
+  case "$arg" in
     "-c")
       echo "Using latest unzipped release instead of getting a new one from the server"
       USE_LATEST_UNZIPPED="y"
@@ -850,7 +850,7 @@ LIST_TEST_PACKAGES="${CGAL_ROOT}/list_test_packages"
 ACTUAL_LOGFILE="${CGAL_ROOT}/`basename ${0}`.log"
 rm -f "${ACTUAL_LOGFILE}"
 
-echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}" 
+echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
 
 # Sanity checks
 if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then
@@ -878,11 +878,11 @@ fi
 # Detects cygwin
 if uname | grep -q "CYGWIN"; then
   JOM="`which jom`"
-  if [ -e "$JOM" ]; then 
+  if [ -e "$JOM" ]; then
     CMAKE_GENERATOR='-GNMake Makefiles JOM'
     MAKE_CMD='jom'
     log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
-  else 
+  else
     CMAKE_GENERATOR='-GNMake Makefiles'
     MAKE_CMD='nmake'
     log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
@@ -899,7 +899,7 @@ if [ -z "$IS_CYGWIN" ]; then
 lockfile -r 1 "$LOCK_FILE";
 if [ ${?} != 0 ]; then
   PID=`cat "$LOCK_FILE"`
-  if kill -0 "$PID"; then 
+  if kill -0 "$PID"; then
     log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID";
     exit 1;
   else
@@ -956,7 +956,7 @@ if [ "${BUILD_HOSTS}" = "localhost" ]; then
   TEXT="`value_of COMPILERS_localhost`"
   if [ -z "${DO_NOT_TEST}" ]; then
     if [ -z "${TEXT}" ]; then
-	    printf "Skipping testing phase (use the -n option to remove this message).\n"
+      printf "Skipping testing phase (use the -n option to remove this message).\n"
       DO_NOT_TEST="y"
     fi
   fi