diff --git a/Distance_2/test/Distance_2/cgal_test b/Distance_2/test/Distance_2/cgal_test
index 40b6f62dea8..0337e799eb7 100755
--- a/Distance_2/test/Distance_2/cgal_test
+++ b/Distance_2/test/Distance_2/cgal_test
@@ -91,13 +91,13 @@ if [ $# -ne 0 ]
 then
     sourcefiles="$*"
 else
-    sourcefiles="tst*.C"
+    sourcefiles="tst*.cpp"
 fi
 
 
 for file in ${sourcefiles}
 do
-    base=`basename ${file} .C`
+    base=`basename ${file} .cpp`
     datafiles="ls  DATA/${base}/ix.*"
     if [  "${datafiles}" ]
     then
diff --git a/Distance_2/test/Distance_2/makefile b/Distance_2/test/Distance_2/makefile
deleted file mode 100644
index 3daf268b125..00000000000
--- a/Distance_2/test/Distance_2/makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-# This is the makefile for compiling a CGAL application.
-
-#---------------------------------------------------------------------#
-#                    include platform specific settings
-#---------------------------------------------------------------------#
-# Choose the right include file from the <cgalroot>/make directory.
-
-# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE
-include $(CGAL_MAKEFILE)
-
-#---------------------------------------------------------------------#
-#                    compiler flags
-#---------------------------------------------------------------------#
-
-CXXFLAGS = \
-           -I../../include \
-           -I../../../Cartesian_kernel/include \
-           -I../../../Homogeneous_kernel/include \
-           $(TESTSUITE_CXXFLAGS) \
-           $(EXTRA_FLAGS) \
-           $(CGAL_CXXFLAGS) \
-           $(DEBUG_OPT)
-
-#---------------------------------------------------------------------#
-#                    linker flags
-#---------------------------------------------------------------------#
-
-LIBPATH = \
-          $(TESTSUITE_LIBPATH) \
-          $(CGAL_LIBPATH)
-
-LDFLAGS = \
-          $(TESTSUITE_LDFLAGS) \
-          $(CGAL_LDFLAGS)
-
-#---------------------------------------------------------------------#
-#                    target entries
-#---------------------------------------------------------------------#
-
-all:            \
-                tst20 \
-                tst21 \
-                tst22 \
-                tst23 \
-                tst24 \
-                tst25 \
-                tst26 \
-                tst27 \
-                tst28 \
-                tst29 \
-                tst30 \
-                tst31 \
-                tst32 \
-                tst33 \
-                tst34 
-
-tst20$(EXE_EXT): tst20$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst20 tst20$(OBJ_EXT) $(LDFLAGS)
-
-tst21$(EXE_EXT): tst21$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst21 tst21$(OBJ_EXT) $(LDFLAGS)
-
-tst22$(EXE_EXT): tst22$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst22 tst22$(OBJ_EXT) $(LDFLAGS)
-
-tst23$(EXE_EXT): tst23$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst23 tst23$(OBJ_EXT) $(LDFLAGS)
-
-tst24$(EXE_EXT): tst24$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst24 tst24$(OBJ_EXT) $(LDFLAGS)
-
-tst25$(EXE_EXT): tst25$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst25 tst25$(OBJ_EXT) $(LDFLAGS)
-
-tst26$(EXE_EXT): tst26$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst26 tst26$(OBJ_EXT) $(LDFLAGS)
-
-tst27$(EXE_EXT): tst27$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst27 tst27$(OBJ_EXT) $(LDFLAGS)
-
-tst28$(EXE_EXT): tst28$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst28 tst28$(OBJ_EXT) $(LDFLAGS)
-
-tst29$(EXE_EXT): tst29$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst29 tst29$(OBJ_EXT) $(LDFLAGS)
-
-tst30$(EXE_EXT): tst30$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst30 tst30$(OBJ_EXT) $(LDFLAGS)
-
-tst31$(EXE_EXT): tst31$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst31 tst31$(OBJ_EXT) $(LDFLAGS)
-
-tst32$(EXE_EXT): tst32$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst32 tst32$(OBJ_EXT) $(LDFLAGS)
-
-tst33$(EXE_EXT): tst33$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst33 tst33$(OBJ_EXT) $(LDFLAGS)
-
-tst34$(EXE_EXT): tst34$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tst34 tst34$(OBJ_EXT) $(LDFLAGS)
-
-clean: \
-                   tst20.clean \
-                   tst21.clean \
-                   tst22.clean \
-                   tst23.clean \
-                   tst24.clean \
-                   tst25.clean \
-                   tst26.clean \
-                   tst27.clean \
-                   tst28.clean \
-                   tst29.clean \
-                   tst30.clean \
-                   tst31.clean \
-                   tst32.clean \
-                   tst33.clean \
-                   tst34.clean 
-
-#---------------------------------------------------------------------#
-#                    suffix rules
-#---------------------------------------------------------------------#
-
-.C$(OBJ_EXT):
-	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
-
diff --git a/Distance_2/test/Distance_2/tst20.C b/Distance_2/test/Distance_2/tst20.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst20.C
rename to Distance_2/test/Distance_2/tst20.cpp
diff --git a/Distance_2/test/Distance_2/tst21.C b/Distance_2/test/Distance_2/tst21.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst21.C
rename to Distance_2/test/Distance_2/tst21.cpp
diff --git a/Distance_2/test/Distance_2/tst22.C b/Distance_2/test/Distance_2/tst22.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst22.C
rename to Distance_2/test/Distance_2/tst22.cpp
diff --git a/Distance_2/test/Distance_2/tst23.C b/Distance_2/test/Distance_2/tst23.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst23.C
rename to Distance_2/test/Distance_2/tst23.cpp
diff --git a/Distance_2/test/Distance_2/tst24.C b/Distance_2/test/Distance_2/tst24.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst24.C
rename to Distance_2/test/Distance_2/tst24.cpp
diff --git a/Distance_2/test/Distance_2/tst25.C b/Distance_2/test/Distance_2/tst25.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst25.C
rename to Distance_2/test/Distance_2/tst25.cpp
diff --git a/Distance_2/test/Distance_2/tst26.C b/Distance_2/test/Distance_2/tst26.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst26.C
rename to Distance_2/test/Distance_2/tst26.cpp
diff --git a/Distance_2/test/Distance_2/tst27.C b/Distance_2/test/Distance_2/tst27.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst27.C
rename to Distance_2/test/Distance_2/tst27.cpp
diff --git a/Distance_2/test/Distance_2/tst28.C b/Distance_2/test/Distance_2/tst28.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst28.C
rename to Distance_2/test/Distance_2/tst28.cpp
diff --git a/Distance_2/test/Distance_2/tst29.C b/Distance_2/test/Distance_2/tst29.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst29.C
rename to Distance_2/test/Distance_2/tst29.cpp
diff --git a/Distance_2/test/Distance_2/tst30.C b/Distance_2/test/Distance_2/tst30.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst30.C
rename to Distance_2/test/Distance_2/tst30.cpp
diff --git a/Distance_2/test/Distance_2/tst31.C b/Distance_2/test/Distance_2/tst31.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst31.C
rename to Distance_2/test/Distance_2/tst31.cpp
diff --git a/Distance_2/test/Distance_2/tst32.C b/Distance_2/test/Distance_2/tst32.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst32.C
rename to Distance_2/test/Distance_2/tst32.cpp
diff --git a/Distance_2/test/Distance_2/tst33.C b/Distance_2/test/Distance_2/tst33.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst33.C
rename to Distance_2/test/Distance_2/tst33.cpp
diff --git a/Distance_2/test/Distance_2/tst34.C b/Distance_2/test/Distance_2/tst34.cpp
similarity index 100%
rename from Distance_2/test/Distance_2/tst34.C
rename to Distance_2/test/Distance_2/tst34.cpp