diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
index c38d1add91d..ee92d955c82 100755
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
@@ -129,7 +129,7 @@ configure()
   rm -rf CMakeCache.txt CMakeFiles/
   if [ -f "$INIT_FILE" ]
   then
-    if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+    if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                         -DCGAL_DIR="$CGAL_DIR" \
                                         -DCGAL_CXX_FLAGS:STRING="$CGAL_CXX_FLAGS $TESTSUITE_CXXFLAGS -I../../include" \
                                         -DCGAL_EXE_LINKER_FLAGS="$CGAL_EXE_LINKER_FLAGS $TESTSUITE_LDFLAGS" \
diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt
index cd2d5457ada..661c72bf8af 100644
--- a/Installation/test/Installation/CMakeLists.txt
+++ b/Installation/test/Installation/CMakeLists.txt
@@ -92,17 +92,11 @@ if(LEDA_FOUND)
   target_link_libraries(test_LEDA_IO ${LEDA_LIBRARIES})
 endif()
 
-if("$ENV{CMAKE_GENERATOR}" STREQUAL "")
-    set(GENERATOR )
-  else()
-    set(GENERATOR $ENV{CMAKE_GENERATOR})
-  endif()
-
-  if("$ENV{INIT_FILE}" STREQUAL "")
+if("$ENV{INIT_FILE}" STREQUAL "")
   set(INIT_FILE )
-  else()
+else()
   set(INIT_FILE -C$ENV{INIT_FILE})
-  endif()
+endif()
 
 function(CGAL_installation_test_find_package_version mode)
   set(EXACT)
@@ -131,7 +125,7 @@ function(CGAL_installation_test_find_package_version mode)
   configure_file(test_find_package.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/test_find_package_version_${mode}/CMakeLists.txt)
 
   add_test(NAME test_find_package_version_${mode}
-    COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release ${CMAKE_CURRENT_BINARY_DIR}/test_find_package_version_${mode}
+    COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release ${CMAKE_CURRENT_BINARY_DIR}/test_find_package_version_${mode}
     )
   cgal_setup_test_properties(test_find_package_version_${mode})
   set_property(TEST test_find_package_version_${mode}
@@ -215,7 +209,7 @@ add_test(NAME install_non_standard_cgal
 #test CGAL_DIR=non standard place without cgal_qt5
 get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
 add_test(NAME test_config_file_3
-COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
+COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
 "${CMAKE_BINARY_DIR}/test_config_file"
 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_3")
 list(APPEND test_config_lst "test_config_file_3")
@@ -223,7 +217,7 @@ list(APPEND test_config_lst "test_config_file_3")
 if(CGAL_Qt5_FOUND)
   #configure cgal for a non standard install with qt5
   add_test(NAME config_non_standard_cgal_qt5
-    COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt5 -DCGAL_INSTALL_LIB_DIR=lib
+    COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt5 -DCGAL_INSTALL_LIB_DIR=lib
     "${CGAL_SOURCE_DIR}"
     WORKING_DIRECTORY "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build_qt5")
   #install cgal in the non standard place
@@ -233,7 +227,7 @@ if(CGAL_Qt5_FOUND)
   #test CGAL_DIR=non standard place with cgal_qt5
   get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_install_qt5/lib/cmake/CGAL/CGALConfig.cmake" DIRECTORY)
   add_test(NAME test_config_file_4
-    COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
+    COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
     "${CMAKE_BINARY_DIR}/test_config_file_qt5"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_4")
   list(APPEND test_config_lst "test_config_file_4")
@@ -242,7 +236,7 @@ endif()#CGAL_Qt5_FOUND
 #test CGAL_DIR=non standard build
 get_filename_component(CGAL_DIR_CORRECT_PATH "${NON_STANDARD_INSTALL_PREFIX}/non_standard_build/CGALConfig.cmake" DIRECTORY)
 add_test(NAME test_config_file_5
-COMMAND ${CMAKE_COMMAND} ${GENERATOR} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
+COMMAND ${CMAKE_COMMAND} ${INIT_FILE} -DCMAKE_BUILD_TYPE=Release -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
  "${CMAKE_BINARY_DIR}/test_config_file"
  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/build-test_config_file_5")
 list(APPEND test_config_lst "test_config_file_5")
diff --git a/Installation/test/Installation/cgal_test_with_cmake b/Installation/test/Installation/cgal_test_with_cmake
index 1180ebb0d1c..728cf75d349 100755
--- a/Installation/test/Installation/cgal_test_with_cmake
+++ b/Installation/test/Installation/cgal_test_with_cmake
@@ -26,7 +26,7 @@ touch ../$ERRORFILE
 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  \
+if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                    -DCGAL_DIR="$CGAL_RELEASE_DIR" -DBUILD_TESTING=ON -DWITH_tests=ON \
                                    ..' ; then
 
diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake b/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
index a69891eaba2..1be7f4c52c1 100755
--- a/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
+++ b/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test_with_cmake
@@ -26,7 +26,7 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
                                      .' ; then
 
diff --git a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake
index acab6d2d965..6fea7949176 100755
--- a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake
+++ b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake
@@ -26,7 +26,7 @@ configure()
 {
   echo "Configuring... "
   
-  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
                                      .' ; then
                                      
diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal
index 079260d565d..f5e0f7fd519 100755
--- a/Scripts/developer_scripts/autotest_cgal
+++ b/Scripts/developer_scripts/autotest_cgal
@@ -80,7 +80,6 @@ REFERENCE_PLATFORMS_DIR="must_be_set_in_.autocgalrc"
 ACTUAL_DIR=`pwd`
 RSH="rsh"
 NICE_OPTIONS="-19"
-CMAKE_GENERATOR=""
 USE_TARGZ="n"
 USE_TARBZ="n"
 PLATFORMS=""
@@ -506,16 +505,12 @@ build_cgal_on_host()
 
         cat >> "${CGAL_BINARY_DIR}/localbuildscript" <<EOF
 CGAL_BINARY_DIR='${CGAL_BINARY_DIR}';
-if [ -z "\$CMAKE_GENERATOR" ]; then
-  CMAKE_GENERATOR='${CMAKE_GENERATOR}';
-fi
 MAKE_CMD='${MAKE_CMD}';
 
-export CMAKE_GENERATOR;
 export MAKE_CMD;
 export CGAL_BINARY_DIR;
 cd '${CGAL_BINARY_DIR}';
-cmake \${INIT_FILE:+"-C\${INIT_FILE}"} '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
+cmake \${INIT_FILE:+"-C\${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE \\
                            VERBOSE=1 \\
                            ../../..;
 ${MAKE_CMD} VERBOSE=ON -k -fMakefile  ;
@@ -604,14 +599,10 @@ else
 fi
 CGAL_TEST_HOST='${HOST}';
 CGAL_TEST_PLATFORM='${PLATFORM}';
-if [ -z "\$CMAKE_GENERATOR" ]; then
-  CMAKE_GENERATOR='${CMAKE_GENERATOR}';
-fi
 MAKE_CMD='${MAKE_CMD}'
 export CGAL_TESTER CGAL_TESTER_NAME CGAL_TESTER_ADDRESS;
 export CGAL_DIR;
 export CGAL_TEST_HOST CGAL_TEST_PLATFORM;
-export CMAKE_GENERATOR;
 export MAKE_CMD;
 
 EOF
@@ -884,43 +875,6 @@ else
   done
 fi
 
-# Detects cygwin
-if uname | grep -q "CYGWIN"; then
-  JOM="`which jom`"
-  if [ -e "$JOM" ]; then
-    CMAKE_GENERATOR='-GNMake Makefiles JOM'
-    MAKE_CMD='jom'
-    log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
-  else
-    CMAKE_GENERATOR='-GNMake Makefiles'
-    MAKE_CMD='nmake'
-    log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
-  fi
-  IS_CYGWIN='y'
-else
-  log "${ACTUAL_LOGFILE}" "Non-cygwin linux detected, using system make."
-  MAKE_CMD='make'
-fi
-
-if [ -z "$IS_CYGWIN" ]; then
-
-# Acquire lock
-lockfile -r 1 "$LOCK_FILE";
-if [ ${?} != 0 ]; then
-  PID=`cat "$LOCK_FILE"`
-  if kill -0 "$PID"; then
-    log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID";
-    exit 1;
-  else
-    # The locking process has died without erasing the lock file
-    rm -f "$LOCK_FILE"
-    lockfile -r 1 "$LOCK_FILE";
-    if [ ${?} != 0 ]; then
-      log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK!";
-      exit 1
-    fi
-  fi
-fi
 # Make that file writable (lockfile create read-only files
 chmod u+w "$LOCK_FILE"
 # Put the PID of current process in the lock file
diff --git a/Scripts/developer_scripts/create_cgal_test b/Scripts/developer_scripts/create_cgal_test
index 635051c3b92..e10c3d11dea 100755
--- a/Scripts/developer_scripts/create_cgal_test
+++ b/Scripts/developer_scripts/create_cgal_test
@@ -80,7 +80,7 @@ configure()
 {
   echo "Configuring... "
 
-  if eval 'cmake ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
                                      --no-warn-unused-cli \
                                      .' ; then
diff --git a/Scripts/scripts/cgal_create_CMakeLists b/Scripts/scripts/cgal_create_CMakeLists
index 67db54e8d38..342f7a363b8 100755
--- a/Scripts/scripts/cgal_create_CMakeLists
+++ b/Scripts/scripts/cgal_create_CMakeLists
@@ -295,7 +295,6 @@ EOF
 add_test( "$BASE" \${CMAKE_CTEST_COMMAND}
   --build-and-test "\${CMAKE_CURRENT_SOURCE_DIR}"
                    "\${CMAKE_CURRENT_BINARY_DIR}"
-  --build-generator "\${CMAKE_GENERATOR}"
   --build-makeprogram "\${CMAKE_MAKE_PROGRAM}"
   --build-target $BASE
   --build-no-clean
diff --git a/Snap_rounding_2/test/Snap_rounding_2/cgal_test_base b/Snap_rounding_2/test/Snap_rounding_2/cgal_test_base
index eb20f1c06cf..d8b31ed0118 100755
--- a/Snap_rounding_2/test/Snap_rounding_2/cgal_test_base
+++ b/Snap_rounding_2/test/Snap_rounding_2/cgal_test_base
@@ -25,7 +25,7 @@ configure()
 {
   echo "Configuring... "
     
-  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                      -DCGAL_DIR="$CGAL_DIR" \
                                      .' ; then
         
diff --git a/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base b/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
index 52f282475ee..c6c8af71e9a 100755
--- a/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
+++ b/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
@@ -33,7 +33,7 @@ configure()
   rm CMakeCache.txt
   if [ -f "$INIT_FILE" ]
   then
-      if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+      if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                        -DCGAL_DIR="$CGAL_DIR" \
                                        -DCGAL_CXX_FLAGS:STRING="$CGAL_CXX_FLAGS $TESTSUITE_CXXFLAGS" \
                                        -DCGAL_EXE_LINKER_FLAGS="$CGAL_EXE_LINKER_FLAGS $TESTSUITE_LDFLAGS" \
@@ -43,7 +43,7 @@ configure()
           echo "   ERROR:    configuration" >> $ERRORFILE
       fi
   else
-      if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+      if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE  \
                                          -DCGAL_DIR="$CGAL_DIR" \
                                          -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
                                          -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \