diff --git a/.gitattributes b/.gitattributes
index fbfb5da1a20..ab361fed41b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1960,7 +1960,6 @@ Stream_lines_2/doc_tex/Stream_lines_2/streamlines-small.jpg -text svneol=unset#i
 Stream_lines_2/doc_tex/Stream_lines_2/streamlines-teaser.jpg -text svneol=unset#image/jpeg
 Stream_lines_2/test/Stream_lines_2/data/datap.tri.cin -text
 Stream_lines_2/test/Stream_lines_2/data/datav.tri.cin -text
-Stream_support/test/Stream_support/cgal_test eol=lf
 Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/CCSubdivision.png -text svneol=unset#image/png
 Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/PQQStencil.eps -text svneol=unset#application/postscript
 Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/PQQStencil.fig -text svneol=unset#application/octet-stream
diff --git a/Stream_support/test/Stream_support/Makefile b/Stream_support/test/Stream_support/Makefile
deleted file mode 100644
index d45a63e0a06..00000000000
--- a/Stream_support/test/Stream_support/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by the script cgal_create_makefile
-# 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 \
-           $(TESTSUITE_CXXFLAGS) \
-           $(EXTRA_FLAGS) \
-           $(CGAL_CXXFLAGS) \
-           $(LONG_NAME_PROBLEM_CXXFLAGS) \
-           $(DEBUG_OPT)
-
-#---------------------------------------------------------------------#
-#                    linker flags
-#---------------------------------------------------------------------#
-
-LIBPATH = \
-          $(TESTSUITE_LIBPATH) \
-          $(CGAL_LIBPATH)
-
-LDFLAGS = \
-          $(TESTSUITE_LDFLAGS) \
-          $(LONG_NAME_PROBLEM_LDFLAGS) \
-          $(CGAL_LDFLAGS)
-
-#---------------------------------------------------------------------#
-#                    target entries
-#---------------------------------------------------------------------#
-
-all:            \
-                test_support$(EXE_EXT) 
-
-test_support$(EXE_EXT): test_support$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_support test_support$(OBJ_EXT) $(LDFLAGS)
-
-clean: \
-                   test_support.clean 
-
-#---------------------------------------------------------------------#
-#                    suffix rules
-#---------------------------------------------------------------------#
-
-.C$(OBJ_EXT):
-	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
-
diff --git a/Stream_support/test/Stream_support/cgal_test b/Stream_support/test/Stream_support/cgal_test
deleted file mode 100755
index 509adc74761..00000000000
--- a/Stream_support/test/Stream_support/cgal_test
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-
-# This is a script for the CGAL test suite. Such a script must obey
-# the following rules:
-#
-# - the name of the script is cgal_test
-# - for every target two one line messages are written to the file 'error.txt'
-#     the first one indicates if the compilation was successful
-#     the second one indicates if the execution was successful
-#   if one of the two was not successful, the line should start with 'ERROR:'
-# - running the script should not require any user interaction
-# - the script should clean up object files and executables
-
-ERRORFILE=error.txt
-
-#---------------------------------------------------------------------#
-#                    compile_and_run <target>
-#---------------------------------------------------------------------#
-
-compile_and_run()
-{
-  echo "Compiling $1 ... "
-  if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE \
-           TESTSUITE_CXXFLAGS="$TESTSUITE_CXXFLAGS" \
-           TESTSUITE_LDFLAGS="$TESTSUITE_LDFLAGS" $1' ; then
-    echo "   compilation of $1 succeeded" >> $ERRORFILE
-  else
-    echo "   ERROR: compilation of $1 failed" >> $ERRORFILE
-  fi
-
-  if [ -f $1 ] ; then
-     OUTPUTFILE=ProgramOutput.$1.$PLATFORM
-    rm -f $OUTPUTFILE
-    COMMAND="./$1"
-    if [ -f $1.cmd ] ; then
-      COMMAND="$COMMAND `cat $1.cmd`"
-    fi
-    if [ -f $1.cin ] ; then
-      COMMAND="cat $1.cin | $COMMAND"
-    fi
-    echo "Executing $1 ... "
-    echo
-    if eval 2>&1 $COMMAND > $OUTPUTFILE ; then
-      echo "   execution of $1 succeeded" >> $ERRORFILE
-    else
-      echo "   ERROR: execution of $1 failed" >> $ERRORFILE
-    fi
-  else
-    echo "   ERROR: could not execute $1" >> $ERRORFILE
-  fi
-
-  eval "2>&1 make CGAL_MAKEFILE=$CGAL_MAKEFILE clean > /dev/null "
-}
-
-#---------------------------------------------------------------------#
-#                    remove the previous error file
-#---------------------------------------------------------------------#
-
-rm -f $ERRORFILE
-touch $ERRORFILE
-
-#---------------------------------------------------------------------#
-#                    compile and run the tests
-#---------------------------------------------------------------------#
-
-if [ $# -ne 0 ] ; then
-  for file in $* ; do
-    compile_and_run $file
-  done
-else
-  compile_and_run test_support
-fi
-
diff --git a/Stream_support/test/Stream_support/test_support.C b/Stream_support/test/Stream_support/test_support.cpp
similarity index 100%
rename from Stream_support/test/Stream_support/test_support.C
rename to Stream_support/test/Stream_support/test_support.cpp