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 c1183a846d8..2b9a9aee225 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,22 +129,36 @@ configure()
 {
   echo "Configuring... "
   rm -rf CMakeCache.txt CMakeFiles/
-  echo "cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
- -DCGAL_DIR=\"$CGAL_DIR\" \
- -DCGAL_CXX_FLAGS:STRING=\"$TESTSUITE_CXXFLAGS -I../../include\" \
- -DCGAL_EXE_LINKER_FLAGS=\"$TESTSUITE_LDFLAGS\" \
- -DCMAKE_BUILD_TYPE=NOTFOUND \
- ."
-  if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
-                                    -DCGAL_DIR="$CGAL_DIR" \
-                                    -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS -I../../include" \
-                                    -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
-                                    -DCMAKE_BUILD_TYPE=NOTFOUND \
-                                    .' ; then
+  if [ -f "$INIT_FILE" ]
+  then
+    if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -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" \
+                                        .' ; then
 
-    echo "   successful configuration" >> $ERRORFILE
+      echo "   successful configuration" >> $ERRORFILE
+    else
+      echo "   ERROR:    configuration" >> $ERRORFILE
+    fi
   else
-    echo "   ERROR:    configuration" >> $ERRORFILE
+    echo "cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+   -DCGAL_DIR=\"$CGAL_DIR\" \
+   -DCGAL_CXX_FLAGS:STRING=\"$TESTSUITE_CXXFLAGS -I../../include\" \
+   -DCGAL_EXE_LINKER_FLAGS=\"$TESTSUITE_LDFLAGS\" \
+   -DCMAKE_BUILD_TYPE=NOTFOUND \
+   ."
+    if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
+                                      -DCGAL_DIR="$CGAL_DIR" \
+                                      -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS -I../../include" \
+                                      -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
+                                      -DCMAKE_BUILD_TYPE=NOTFOUND \
+                                      .' ; then
+
+      echo "   successful configuration" >> $ERRORFILE
+    else
+      echo "   ERROR:    configuration" >> $ERRORFILE
+    fi
   fi
 }
 
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 59f380da802..52f282475ee 100755
--- a/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
+++ b/Surface_sweep_2/test/Surface_sweep_2/cgal_test_base
@@ -28,21 +28,33 @@ fi
 
 configure()
 {
-    echo "Configuring... "
+  echo "Configuring... "
 
-    rm CMakeCache.txt
+  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  \
+                                       -DCGAL_DIR="$CGAL_DIR" \
+                                       -DCGAL_CXX_FLAGS:STRING="$CGAL_CXX_FLAGS $TESTSUITE_CXXFLAGS" \
+                                       -DCGAL_EXE_LINKER_FLAGS="$CGAL_EXE_LINKER_FLAGS $TESTSUITE_LDFLAGS" \
+                                       .' ; then
+          echo "   successful configuration" >> $ERRORFILE
+      else
+          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  \
+                                         -DCGAL_DIR="$CGAL_DIR" \
+                                         -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
+                                         -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
+                                         -DCMAKE_BUILD_TYPE=NOTFOUND \
+                                         .' ; then
 
-    if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \
-                                     -DCGAL_DIR="$CGAL_DIR" \
-                                     -DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
-                                     -DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
-                                     -DCMAKE_BUILD_TYPE=NOTFOUND \
-                                     .' ; then
-        
-	echo "   successful configuration" >> $ERRORFILE
-    else
-	echo "   ERROR:    configuration" >> $ERRORFILE
-    fi
+          echo "   successful configuration" >> $ERRORFILE
+      else
+          echo "   ERROR:    configuration" >> $ERRORFILE
+      fi
+  fi
 }
 
 compile()