diff --git a/Scripts/developer_scripts/autotest_cgal_with_cmake b/Scripts/developer_scripts/autotest_cgal_with_cmake
index 446aefaed86..a8ab188f9bf 100755
--- a/Scripts/developer_scripts/autotest_cgal_with_cmake
+++ b/Scripts/developer_scripts/autotest_cgal_with_cmake
@@ -378,12 +378,18 @@ setup_dirs()
   
   CGAL_TEST_DIR=${CGAL_DIR}/test
 
-  CGAL_BINARY_DIR_BASE=${CGAL_DIR}/cmake/platforms
-
-  if [ ! d "${CGAL_BINARY_DIR_BASE}" ]; then
-    mkdir "${CGAL_BINARY_DIR_BASE}"
+  if [ ! -d "${CGAL_DIR}/cmake" ]; then
+    mkdir "${CGAL_DIR}/cmake"
+    log "${ACTUAL_LOGFILE}" "Creating ${CGAL_DIR}/cmake"
   fi
   
+  if [ ! -d "${CGAL_DIR}/cmake/platforms" ]; then
+    mkdir "${CGAL_DIR}/cmake/platforms"
+    log "${ACTUAL_LOGFILE}" "Creating ${CGAL_DIR}/cmake/platforms"
+  fi
+  
+  CGAL_BINARY_DIR_BASE=${CGAL_DIR}/cmake/platforms
+
   CGAL_RELEASE_DIR=`readlink "${CGAL_DIR}"`
   
   CGAL_RELEASE_ID=`basename "${CGAL_RELEASE_DIR}"`