diff --git a/Console/Node.test.cc b/Console/Node.test.cc
index 2170d4291738763e303f6988c29249e23ea4bd0a..0c94afd1867eb2ba7a89ad972818e7c20d7f9941 100644
--- a/Console/Node.test.cc
+++ b/Console/Node.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Node.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Console/Parse.test.cc b/Console/Parse.test.cc
index 0143b703fa91d8ce921ec568bbb44205683c9fa0..3f83d57265064480e2825ce5b9f85846af3168f5 100644
--- a/Console/Parse.test.cc
+++ b/Console/Parse.test.cc
@@ -35,7 +35,7 @@
 #include "Parse.ih"
 #include "../Utils/String.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Console/Server.test.cc b/Console/Server.test.cc
index 0e5e9f6f741f9d330ffbae92885e17d831539363..7c54f39736472b31532021bca21ef7c60ff529a8 100644
--- a/Console/Server.test.cc
+++ b/Console/Server.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Server.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/MPESection.test.cc b/Packets/MPEGDVBBundle/MPESection.test.cc
index 3833a8357770aad4975ec164a83ce61ee819b4ca..91ba6773ed10d42b2ac7045f96f128b5016cce1e 100644
--- a/Packets/MPEGDVBBundle/MPESection.test.cc
+++ b/Packets/MPEGDVBBundle/MPESection.test.cc
@@ -184,7 +184,7 @@ BOOST_AUTO_UNIT_TEST(MPESection_create)
             0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x52, 0xdf,
             0x6a, 0x1d
     };    
-    BOOST_CHECK( equal( sec.data().begin(), sec.data().end(), sec_data ));    
+    BOOST_CHECK( equal( sec.data().begin(), sec.data().end(), sec_data ));
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
diff --git a/Utils/String.test.cc b/Utils/String.test.cc
index e703820e9f91adcf67307db8c6f4abe848393495..7d0bf0b6fa65532364a81f0b79a81b333c4409e2 100644
--- a/Utils/String.test.cc
+++ b/Utils/String.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "String.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_