diff --git a/BGL/test/BGL/graph_concept_OpenMesh.cpp b/BGL/test/BGL/graph_concept_OpenMesh.cpp
old mode 100755
new mode 100644
index 1e3b6a5a55e..5c1b51c81c0
--- a/BGL/test/BGL/graph_concept_OpenMesh.cpp
+++ b/BGL/test/BGL/graph_concept_OpenMesh.cpp
@@ -18,7 +18,7 @@
 //
 // Author(s)     : Philipp Möller, Andreas Fabri
 
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include <CGAL/basic.h>
 #include <OpenMesh/Core/IO/MeshIO.hh>
diff --git a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
index 3d624445d12..2ad14e37b62 100644
--- a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
+++ b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
@@ -18,9 +18,9 @@
 //
 // Author(s)     : Philipp Möller
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_MAIN 1
+#include <boost/test/unit_test.hpp>
 
-#include <CGAL/basic.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/graph_concepts.h>
@@ -131,6 +131,9 @@ void runtime_check_halfedgegraph()
   BOOST_CHECK_EQUAL(num_faces(p), 4);
 }
 
+
+
+
 boost::unit_test::test_suite*
 init_unit_test_suite( int, char** const)
 {
@@ -143,6 +146,8 @@ init_unit_test_suite( int, char** const)
     return 0;
 }
 
+
+
 // int main()
 // {
 //   return 0;
diff --git a/BGL/test/BGL/graph_concept_Triangulation_2.cpp b/BGL/test/BGL/graph_concept_Triangulation_2.cpp
index 06544c8993f..eedec2f3d11 100644
--- a/BGL/test/BGL/graph_concept_Triangulation_2.cpp
+++ b/BGL/test/BGL/graph_concept_Triangulation_2.cpp
@@ -18,7 +18,6 @@
 //
 // Author(s)     : Philipp Möller
 
-#include <CGAL/basic.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
 
diff --git a/BGL/test/BGL/test_Euler_operations.cpp b/BGL/test/BGL/test_Euler_operations.cpp
index 28a3eb96e9d..d2bb4c2f1fe 100644
--- a/BGL/test/BGL/test_Euler_operations.cpp
+++ b/BGL/test/BGL/test_Euler_operations.cpp
@@ -1,5 +1,5 @@
 #define BOOST_TEST_MODULE euler_operations test
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
 
 #include "test_Prefix.h"
diff --git a/BGL/test/BGL/test_Prefix.h b/BGL/test/BGL/test_Prefix.h
index 62931d24bd2..a0ad72564ee 100644
--- a/BGL/test/BGL/test_Prefix.h
+++ b/BGL/test/BGL/test_Prefix.h
@@ -8,7 +8,6 @@
 #include <boost/assign.hpp>
 #include <boost/mpl/list.hpp>
 
-#include <CGAL/basic.h>
 #include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/Polyhedron_items_with_id_3.h>
diff --git a/BGL/test/BGL/test_Properties.cpp b/BGL/test/BGL/test_Properties.cpp
index 5edd251b9cf..70ace25147c 100644
--- a/BGL/test/BGL/test_Properties.cpp
+++ b/BGL/test/BGL/test_Properties.cpp
@@ -1,4 +1,6 @@
-#include <boost/test/included/unit_test.hpp>
+
+#define BOOST_TEST_MAIN 1
+#include <boost/test/unit_test.hpp>
 #include <boost/test/parameterized_test.hpp>
 
 #include "test_Prefix.h"
diff --git a/BGL/test/BGL/test_Triangulation_2.cpp b/BGL/test/BGL/test_Triangulation_2.cpp
index 2bc945362d6..b1a68271b07 100644
--- a/BGL/test/BGL/test_Triangulation_2.cpp
+++ b/BGL/test/BGL/test_Triangulation_2.cpp
@@ -1,4 +1,3 @@
-#include <CGAL/basic.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
 
diff --git a/BGL/test/BGL/test_graph_geometry.cpp b/BGL/test/BGL/test_graph_geometry.cpp
index c29cec9a38c..74a68eaefa6 100644
--- a/BGL/test/BGL/test_graph_geometry.cpp
+++ b/BGL/test/BGL/test_graph_geometry.cpp
@@ -1,5 +1,5 @@
 #define BOOST_TEST_MODULE graph_geometry test
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include "test_Prefix.h"
 
diff --git a/BGL/test/BGL/test_graph_traits.cpp b/BGL/test/BGL/test_graph_traits.cpp
index 6e68bdfe81b..7650f38e074 100644
--- a/BGL/test/BGL/test_graph_traits.cpp
+++ b/BGL/test/BGL/test_graph_traits.cpp
@@ -1,4 +1,6 @@
-#include <boost/test/included/unit_test.hpp>
+
+#define BOOST_TEST_MAIN 1
+
 #include <boost/test/parameterized_test.hpp>
 #include <boost/test/test_case_template.hpp>