diff --git a/.gitattributes b/.gitattributes
index ba15516ee3f..5446f0b9009 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2757,7 +2757,6 @@ Minkowski_sum_2/doc_tex/Minkowski_sum_2/fig/tight.pstex_t -text svneol=unset#app
 Minkowski_sum_2/examples/Minkowski_sum_2/rooms_star.dat -text
 Minkowski_sum_2/examples/Minkowski_sum_2/spiked.dat -text
 Minkowski_sum_2/examples/Minkowski_sum_2/tight.dat -text
-Minkowski_sum_2/test/Minkowski_sum_2/cgal_test eol=lf
 Minkowski_sum_2/test/Minkowski_sum_2/data/comb_part1.dat -text
 Minkowski_sum_2/test/Minkowski_sum_2/data/comb_part2.dat -text
 Minkowski_sum_2/test/Minkowski_sum_2/data/fork_part1.dat -text
@@ -2776,6 +2775,9 @@ Minkowski_sum_2/test/Minkowski_sum_2/data/rooms_part1.dat -text
 Minkowski_sum_2/test/Minkowski_sum_2/data/rooms_part2.dat -text
 Minkowski_sum_2/test/Minkowski_sum_2/data/wheels_part1.dat -text
 Minkowski_sum_2/test/Minkowski_sum_2/data/wheels_part2.dat -text
+Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cmd -text
+Minkowski_sum_2/test/Minkowski_sum_2/test_approx_offset.cmd -text
+Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cmd -text
 Minkowski_sum_3/doc_tex/Minkowski_sum_3/PkgDescription.tex -text
 Minkowski_sum_3/doc_tex/Minkowski_sum_3/fig/decomposition_method.eps -text
 Minkowski_sum_3/doc_tex/Minkowski_sum_3/fig/decomposition_method.gif -text
diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test b/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test
deleted file mode 100755
index 3c7b16a26fa..00000000000
--- a/Minkowski_sum_2/test/Minkowski_sum_2/cgal_test
+++ /dev/null
@@ -1,143 +0,0 @@
-#! /bin/bash
-
-# 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_test()
-{
-  local name=$1;
-  
-  echo "Compiling $name ... "
-  if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE $name'; then
-    echo "   succesful compilation of $name" >> $ERRORFILE;
-    res=1;
-  else
-    echo "   ERROR:    compilation of $name" >> $ERRORFILE;
-    res=0;
-  fi
-}
-
-run_test_Minkowski_sum()
-{
-  local datafile=$1;
-  local flags=$2;
-
-  basedata=`basename "$datafile"`
-  OUTPUTFILE=ProgramOutput.$basedata.test_Minkowski_sum.$PLATFORM
-  first_file="$datafile"_part1.dat
-  second_file="$datafile"_part2.dat
-  
-  rm -f $OUTPUTFILE
-  COMMAND="./test_Minkowski_sum"
-  echo "Executing $COMMAND $first_file $second_file $flags ... "
-  echo
-  if eval $COMMAND $first_file $second_file $flags > $OUTPUTFILE 2>&1 ; then
-    echo "   succesful execution of test_Minkowski_sum $datafile" >> $ERRORFILE
-  else
-    echo "   ERROR:    execution of test_Minkowski_sum $datafile" >> $ERRORFILE
-  fi
-}
-
-clean_tests()
-{
-  eval "make CGAL_MAKEFILE=$CGAL_MAKEFILE clean > /dev/null 2>&1 "
-}
-
-#---------------------------------------------------------------------#
-# Minkowski sum test
-#---------------------------------------------------------------------#
-Minkowski_sum_tests()
-{
-  compile_test test_Minkowski_sum
-
-  if [ ${res} -eq 0 ] ; then
-    echo   "   ERROR:    not executed   test_Minkowski_sum" >> $ERRORFILE
-  else
-    run_test_Minkowski_sum data/rooms -sohg
-    run_test_Minkowski_sum data/comb -sohg
-    run_test_Minkowski_sum data/fork -soh
-    run_test_Minkowski_sum data/knife -so
-    run_test_Minkowski_sum data/mchain -sh
-    run_test_Minkowski_sum data/random -sg
-    run_test_Minkowski_sum data/wheels -hg
-    run_test_Minkowski_sum data/r35975 -sohg
-    run_test_Minkowski_sum data/r38305 -sohg
-  fi
-  clean_tests
-}
-
-#---------------------------------------------------------------------#
-# Offset tests
-#---------------------------------------------------------------------#
-run_offset_test()
-{
-  local program=$1;
-  local datafile=$2;
-  local radius=$3;
-  local flags=$4;
-
-  basedata=`basename "$datafile"`
-  OUTPUTFILE=ProgramOutput.$basedata.$program.$PLATFORM
-  
-  rm -f $OUTPUTFILE
-  COMMAND="./$program"
-  echo "Executing $COMMAND $datafile $radius $flags ... "
-  echo
-  if eval $COMMAND $datafile $radius $flags > $OUTPUTFILE 2>&1 ; then
-    echo "   succesful execution of $program $datafile" >> $ERRORFILE
-  else
-    echo "   ERROR:    execution of $program $datafile" >> $ERRORFILE
-  fi
-}
-
-offset_tests()
-{
-  compile_test test_exact_offset
-
-  if [ ${res} -eq 0 ] ; then
-    echo   "   ERROR:    not executed   test_exact_offset" >> $ERRORFILE
-  else
-    run_offset_test test_exact_offset data/random_part1.dat 5/1 -sohg
-    run_offset_test test_exact_offset data/comb_part1.dat 1/1 -sohg
-    run_offset_test test_exact_offset data/wheels_part1.dat 100000/1 -sohg
-  fi
-
-  compile_test test_approx_offset
-
-  if [ ${res} -eq 0 ] ; then
-    echo   "   ERROR:    not executed   test_approx_offset" >> $ERRORFILE
-  else
-    run_offset_test test_approx_offset data/rooms_part1.dat 3/1 -sohg
-    run_offset_test test_approx_offset data/comb_part1.dat 1/1 -so
-  fi
-
-  clean_tests
-}
-
-#---------------------------------------------------------------------#
-#                    remove the previous error file
-#---------------------------------------------------------------------#
-
-rm -f $ERRORFILE
-touch $ERRORFILE
-
-#---------------------------------------------------------------------#
-#                    compile and run the tests
-#---------------------------------------------------------------------#
-
-Minkowski_sum_tests
-offset_tests
diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cmd b/Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cmd
new file mode 100644
index 00000000000..39e5bf5ce73
--- /dev/null
+++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cmd
@@ -0,0 +1,9 @@
+./data/rooms_part1.dat ./data/rooms_part2.dat -sohg
+./data/comb_part1.dat ./data/comb_part2.dat -sohg
+./data/fork_part1.dat ./data/fork_part2.dat -soh
+./data/knife_part1.dat ./data/knife_part2.dat -so
+./data/mchain_part1.dat ./data/mchain_part2.dat -sh
+./data/random_part1.dat ./data/random_part2.dat -sg
+./data/wheels_part1.dat ./data/wheels_part2.dat -hg
+./data/r35975_part1.dat ./data/r35975_part2.dat -sohg
+./data/r38305_part1.dat ./data/r38305_part2.dat -sohg
diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_approx_offset.cmd b/Minkowski_sum_2/test/Minkowski_sum_2/test_approx_offset.cmd
new file mode 100644
index 00000000000..aa22d269382
--- /dev/null
+++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_approx_offset.cmd
@@ -0,0 +1,2 @@
+./data/rooms_part1.dat 3/1 -sohg
+./data/comb_part1.dat 1/1 -so
diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cmd b/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cmd
new file mode 100644
index 00000000000..9ff7744830f
--- /dev/null
+++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_exact_offset.cmd
@@ -0,0 +1,3 @@
+./data/random_part1.dat 5/1 -sohg
+./data/comb_part1.dat 1/1 -sohg
+./data/wheels_part1.dat 100000/1 -sohg