diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index e72f75a54c0..6bcabeee20a 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -205,6 +205,27 @@ put_on_web()
 
 
 
+collect_demo_binaries()
+{
+  PLATFORM=${1}
+
+  if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
+    echo 'COLLECTING DEMOS BINARIES';
+    echo "cp ${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
+    cp "${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
+
+    for demo_dir in *_Demo; do
+      echo "pushd ${demo_dir}"
+      pushd "${demo_dir}"
+      bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" ""
+      mv "${demo_dir}_with_dlls" ..
+      popd
+    done
+
+    tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*
+  fi
+}
+
 publish_results()
 {
   PLATFORM=${1}
@@ -305,85 +326,6 @@ run_test_on_platform()
     ctest ${TO_TEST:+-L ${TO_TEST} } ${CTEST_OPTS} -j${NUMBER_OF_PROCESSORS} ${KEEP_TESTS:+-FC .}|tee tmp.txt
   fi
 
-  if [ -f "${CGAL_BINARY_DIR}/localtestscript" ]; then
-    log "${ACTUAL_LOGFILE}" "WARNING! Already tested on platform ${PLATFORM}."
-  else
-    if [ -f "${CGAL_BINARY_DIR}/setup" ]; then
-      cp "${CGAL_BINARY_DIR}/setup" "${CGAL_BINARY_DIR}/localtestscript"
-    else
-      rm -f "${CGAL_BINARY_DIR}/localtestscript"
-    fi
-
-    cat >> "${CGAL_BINARY_DIR}/localtestscript" <<EOF
-    LIST_TEST_PACKAGES='${LIST_TEST_PACKAGES}'
-    CGAL_ROOT='${CGAL_ROOT}'
-
-    rm -rf '${CGAL_BINARY_DIR}/test';
-    if [ -f '${LIST_TEST_PACKAGES}' ]; then
-      mkdir '${CGAL_BINARY_DIR}/test'
-
-    cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake' '${CGAL_BINARY_DIR}/test'
-    cp '${CGAL_TEST_DIR}/makefile2'                           '${CGAL_BINARY_DIR}/test'
-    cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake'            '${CGAL_BINARY_DIR}/test'
-
-    # list all packages in CGAL_TEST_DIR. If PACKAGE is found in LIST_TEST_PACKAGES,
-    # copy it, else prepare for the special "skipped" case in the table.
-    for PACKAGE in \$(ls "${CGAL_TEST_DIR}"); do
-      if [ -d "${CGAL_TEST_DIR}/\$PACKAGE" ]; then
-        if source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}' | grep -E -q \$PACKAGE; then
-          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
-          cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
-        elif [ "\$PACKAGE" = "resources" ]; then
-          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
-          cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
-        else
-          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
-          touch "${CGAL_BINARY_DIR}/test/\${PACKAGE}/skipped"
-        fi
-      fi
-
-  done
-
-else
-  cp -r '${CGAL_TEST_DIR}' '${CGAL_BINARY_DIR}/test';
-fi
-
-cd '${CGAL_BINARY_DIR}/test';
-if [ -n "\${ULIMIT_OPTIONS}" ]; then
-  eval ulimit \${ULIMIT_OPTIONS};
-else
-  [ -n "${ULIMIT_OPTIONS}" ] && ulimit ${ULIMIT_OPTIONS};
-fi
-nice ${NICE_OPTIONS} make ${MAKE_OPTS} -k -fmakefile2;
-EOF
-    for file in "${CGAL_BINARY_DIR}/localtestscript" "${CGAL_BINARY_DIR}/localtestscript-redo-results-collection"; do
-      cat >> "$file" <<EOF
-      echo 'COLLECTING RESULTS';
-      ./collect_cgal_testresults_from_cmake;
-      if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
-        echo 'COLLECTING DEMOS BINARIES';
-        echo "cp ${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
-        cp "${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
-EOF
-      cat >> "$file" <<'EOF'
-      for demo_dir in *_Demo; do
-        echo "pushd ${demo_dir}"
-        pushd "${demo_dir}"
-        bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" ""
-        mv "${demo_dir}_with_dlls" ..
-        popd
-      done
-EOF
-      cat >> "$file" <<EOF
-          tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*
-        fi
-        echo 'COPYING RESULTS';
-        cp 'results_${CGAL_TESTER}_${PLATFORM}.tar.gz' 'results_${CGAL_TESTER}_${PLATFORM}.txt' '${CGAL_TEST_DIR}';
-        cd ..;
-EOF
-    done
-
-
   #####################
   ##   GET RESULTS   ##
   #####################
@@ -450,6 +392,9 @@ run_test_on_host()
   for PLATFORM in ${PLATFORMS}; do
     run_test_on_platform "${PLATFORM}"
     publish_results "${PLATFORM}"
+    if [ -n "${COLLECT_DEMO_BINARIES}" ]; then
+      collect_demo_binaries "${PLATFORM}"
+    fi
     if [ -z "${KEEP_TESTS}" ]; then
       rm -rf $CGAL_DIR/cmake/platforms/${PLATFORM}
     fi