diff --git a/test/binomial_heap_test.cpp b/test/binomial_heap_test.cpp
index f17acfd..50c0e17 100644
--- a/test/binomial_heap_test.cpp
+++ b/test/binomial_heap_test.cpp
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/binomial_heap.hpp"
+#include <boost/heap/binomial_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"
diff --git a/test/common_heap_tests.hpp b/test/common_heap_tests.hpp
index 75a9d21..6aabbd0 100644
--- a/test/common_heap_tests.hpp
+++ b/test/common_heap_tests.hpp
@@ -7,7 +7,7 @@
 #include <boost/concept/assert.hpp>
 #include <boost/concept_archetype.hpp>
 
-#include "../../../boost/heap/heap_concepts.hpp"
+#include <boost/heap/heap_concepts.hpp>
 
 
 typedef boost::default_constructible_archetype<
diff --git a/test/d_ary_heap_test.cpp b/test/d_ary_heap_test.cpp
index 54382df..18a4248 100644
--- a/test/d_ary_heap_test.cpp
+++ b/test/d_ary_heap_test.cpp
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/d_ary_heap.hpp"
+#include <boost/heap/d_ary_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"
diff --git a/test/fibonacci_heap_test.cpp b/test/fibonacci_heap_test.cpp
index 8b46292..7429a24 100644
--- a/test/fibonacci_heap_test.cpp
+++ b/test/fibonacci_heap_test.cpp
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/fibonacci_heap.hpp"
+#include <boost/heap/fibonacci_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"
diff --git a/test/mutable_heap_test.cpp b/test/mutable_heap_test.cpp
index 8befde5..b7827fc 100644
--- a/test/mutable_heap_test.cpp
+++ b/test/mutable_heap_test.cpp
@@ -1,7 +1,5 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <boost/heap/d_ary_heap.hpp>
 #include <boost/heap/fibonacci_heap.hpp>
diff --git a/test/pairing_heap_tests.cpp b/test/pairing_heap_tests.cpp
index 7feda65..bb7132d 100644
--- a/test/pairing_heap_tests.cpp
+++ b/test/pairing_heap_tests.cpp
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/pairing_heap.hpp"
+#include <boost/heap/pairing_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"
diff --git a/test/priority_queue_test.cpp b/test/priority_queue_test.cpp
index f51bb2f..9ad5142 100644
--- a/test/priority_queue_test.cpp
+++ b/test/priority_queue_test.cpp
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/priority_queue.hpp"
+#include <boost/heap/priority_queue.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"
diff --git a/test/skew_heap_test.cpp b/test/skew_heap_test.cpp
index 482e7b4..fb79381 100644
--- a/test/skew_heap_test.cpp
+++ b/test/skew_heap_test.cpp
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/skew_heap.hpp"
+#include <boost/heap/skew_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"