diff --git a/.gitattributes b/.gitattributes
index 38320ad4f0b..35a89b731c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -44,7 +44,6 @@ Documentation/Doxyfile text eol=lf
 Documentation/pkglist_filter text eol=lf
 Installation/update_CHANGES text eol=lf
 Scripts/developer_scripts/autotest_cgal text eol=lf
-Scripts/developer_scripts/autotest_cgal_with_cmake text eol=lf
 Scripts/developer_scripts/cgal_build text eol=lf
 Scripts/developer_scripts/cgal_depend text eol=lf
 Scripts/developer_scripts/cgal_git_update_hooks_for_client text eol=lf
diff --git a/Documentation/doc/Documentation/Developer_manual/Chapter_testing.txt b/Documentation/doc/Documentation/Developer_manual/Chapter_testing.txt
index 627d452e1b8..42215c6eef1 100644
--- a/Documentation/doc/Documentation/Developer_manual/Chapter_testing.txt
+++ b/Documentation/doc/Documentation/Developer_manual/Chapter_testing.txt
@@ -46,7 +46,7 @@ Then you need to compile this flat release and set `CGAL_DIR` accordingly as exp
 To run the test-suite simply do:
 \code
   > cd CGAL-I-FOO/test
-  > ./run_testsuite_with_cmake
+  > ./run_testsuite_with_ctest
 \endcode
 and wait for the results to be written in the file `error.txt`.
 
diff --git a/Testsuite/test/makefile2 b/Testsuite/test/makefile2
deleted file mode 100644
index c1c3dfe4fc1..00000000000
--- a/Testsuite/test/makefile2
+++ /dev/null
@@ -1,15 +0,0 @@
-# A GNU makefile which calls run_testsuite_with_cmake over all directories.
-
-dirs:=$(wildcard */)
-targets:=$(addsuffix pink_elephant,$(dirs))
-cleans:=$(addsuffix green_elephant,$(dirs))
-
-all: ${targets}
-
-clean: ${cleans}
-
-%/pink_elephant:
-	@+./run_testsuite_with_cmake $*
-
-%/green_elephant:
-	@cd $* && $(MAKE) clean
diff --git a/Testsuite/test/testsuite_branch_build.mk b/Testsuite/test/testsuite_branch_build.mk
deleted file mode 100644
index df517e7e8ab..00000000000
--- a/Testsuite/test/testsuite_branch_build.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# A GNU makefile which calls run_testsuite_with_cmake over all directories.
-
-dirs:=$(wildcard ../../*/test/*/)
-targets:=$(addsuffix pink_elephant,$(dirs))
-cleans:=$(addsuffix green_elephant,$(dirs))
-
-all: ${targets}
-
-clean: ${cleans}
-
-%/pink_elephant:
-	@+./run_testsuite_with_cmake $*
-
-%/green_elephant:
-	@cd $* && $(MAKE) clean