diff --git a/test/adaptor_test/type_erased.cpp b/test/adaptor_test/type_erased.cpp
index aad2f27..edea1c4 100644
--- a/test/adaptor_test/type_erased.cpp
+++ b/test/adaptor_test/type_erased.cpp
@@ -10,11 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
 #include <list>
 #include <vector>
 
diff --git a/test/adaptor_test/type_erased_abstract.cpp b/test/adaptor_test/type_erased_abstract.cpp
index 3f3263e..dd54890 100644
--- a/test/adaptor_test/type_erased_abstract.cpp
+++ b/test/adaptor_test/type_erased_abstract.cpp
@@ -8,20 +8,15 @@
 #include <boost/range/adaptor/type_erased.hpp>
 #include "type_erased_test.hpp"
 
-#include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test.hpp>
 
-#include <boost/assign.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
 #include <vector>
 
 namespace boost_range_adaptor_type_erased_test
 {
     namespace
     {
+
 class dummy_interface
 {
 public:
@@ -80,10 +75,10 @@ void test_type_erased_abstract()
 } // namespace boost_range_adaptor_type_erased_test
 
 boost::unit_test::test_suite*
-init_unit_test_suite(int argc, char* argv[])
+init_unit_test_suite(int, char*[])
 {
     boost::unit_test::test_suite* test
-        = BOOST_TEST_SUITE( "RangeTestSuite.adaptor.type_erased_abstract" );
+        = BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased_abstract");
 
     test->add(
         BOOST_TEST_CASE(
diff --git a/test/adaptor_test/type_erased_bidirectional.cpp b/test/adaptor_test/type_erased_bidirectional.cpp
index fbcd852..3dc86fe 100644
--- a/test/adaptor_test/type_erased_bidirectional.cpp
+++ b/test/adaptor_test/type_erased_bidirectional.cpp
@@ -10,11 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
 #include <list>
 #include <deque>
 #include <vector>
@@ -49,7 +44,7 @@ void test_bidirectional()
 } // namespace boost_range_adaptor_type_erased_test
 
 boost::unit_test::test_suite*
-init_unit_test_suite(int argc, char* argv[])
+init_unit_test_suite(int, char*[])
 {
     boost::unit_test::test_suite* test =
         BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased_bidirectional");
diff --git a/test/adaptor_test/type_erased_brackets.cpp b/test/adaptor_test/type_erased_brackets.cpp
index 95e61ec..9d5c7dd 100644
--- a/test/adaptor_test/type_erased_brackets.cpp
+++ b/test/adaptor_test/type_erased_brackets.cpp
@@ -10,13 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
-#include <list>
-#include <set>
 #include <vector>
 
 namespace boost_range_adaptor_type_erased_test
@@ -24,7 +17,7 @@ namespace boost_range_adaptor_type_erased_test
     namespace
     {
 
-void test_type_erased_operator_brackets()
+void test_operator_brackets()
 {
     typedef boost::adaptors::type_erased<> type_erased_t;
 
@@ -55,7 +48,7 @@ void test_type_erased_operator_brackets()
 
     for (int i = 0; i < 10; ++i)
     {
-        BOOST_CHECK_EQUAL( rng[i], i );
+        BOOST_CHECK_EQUAL(rng[i], i);
     }
 }
 
@@ -63,12 +56,14 @@ void test_type_erased_operator_brackets()
 } // namespace boost_range_adaptor_type_erased_test
 
 boost::unit_test::test_suite*
-init_unit_test_suite(int argc, char* argv[])
+init_unit_test_suite(int, char*[])
 {
     boost::unit_test::test_suite* test
-        = BOOST_TEST_SUITE( "RangeTestSuite.adaptor.type_erased" );
+        = BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased_brackets");
 
-    test->add( BOOST_TEST_CASE( &boost_range_adaptor_type_erased_test::test_type_erased_operator_brackets ) );
+    test->add(
+        BOOST_TEST_CASE(
+            &boost_range_adaptor_type_erased_test::test_operator_brackets));
 
     return test;
 }
diff --git a/test/adaptor_test/type_erased_forward.cpp b/test/adaptor_test/type_erased_forward.cpp
index 41e491b..7f6540f 100644
--- a/test/adaptor_test/type_erased_forward.cpp
+++ b/test/adaptor_test/type_erased_forward.cpp
@@ -10,13 +10,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
-#include <list>
 #include <deque>
+#include <list>
 #include <vector>
 
 namespace boost_range_adaptor_type_erased_test
@@ -49,7 +44,7 @@ void test_forward()
 } // namespace boost_range_adaptor_type_erased_test
 
 boost::unit_test::test_suite*
-init_unit_test_suite(int argc, char* argv[])
+init_unit_test_suite(int, char*[])
 {
     boost::unit_test::test_suite* test =
         BOOST_TEST_SUITE( "RangeTestSuite.adaptor.type_erased_forward" );
diff --git a/test/adaptor_test/type_erased_mix_values.cpp b/test/adaptor_test/type_erased_mix_values.cpp
index ae5fe84..e91644c 100644
--- a/test/adaptor_test/type_erased_mix_values.cpp
+++ b/test/adaptor_test/type_erased_mix_values.cpp
@@ -10,13 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
-#include <list>
-#include <set>
 #include <vector>
 
 namespace boost_range_adaptor_type_erased_test
@@ -34,7 +27,7 @@ template<
 >
 void mix_values_impl()
 {
-    typedef std::vector< ValueType > Container;
+    typedef std::vector<ValueType> Container;
 
     typedef typename boost::any_range_type_generator<
         Container
@@ -56,13 +49,13 @@ void mix_values_impl()
 
     const source_type source_data(test_data);
     target_type t1(source_data);
-    BOOST_CHECK_EQUAL_COLLECTIONS( source_data.begin(), source_data.end(),
-                                   t1.begin(), t1.end() );
+    BOOST_CHECK_EQUAL_COLLECTIONS(source_data.begin(), source_data.end(),
+                                  t1.begin(), t1.end());
 
     target_type t2;
     t2 = source_data;
-    BOOST_CHECK_EQUAL_COLLECTIONS( source_data.begin(), source_data.end(),
-                                   t2.begin(), t2.end() );
+    BOOST_CHECK_EQUAL_COLLECTIONS(source_data.begin(), source_data.end(),
+                                  t2.begin(), t2.end());
 }
 
 template<class Traversal>
@@ -78,17 +71,17 @@ void mix_values_driver()
 
 void mix_values()
 {
-    mix_values_driver< boost::single_pass_traversal_tag >();
-    mix_values_driver< boost::forward_traversal_tag >();
-    mix_values_driver< boost::bidirectional_traversal_tag >();
-    mix_values_driver< boost::random_access_traversal_tag >();
+    mix_values_driver<boost::single_pass_traversal_tag >();
+    mix_values_driver<boost::forward_traversal_tag >();
+    mix_values_driver<boost::bidirectional_traversal_tag >();
+    mix_values_driver<boost::random_access_traversal_tag >();
 }
 
     } // anonymous namespace
 } // namespace boost_range_adaptor_type_erased_test
 
 boost::unit_test::test_suite*
-init_unit_test_suite(int argc, char* argv[])
+init_unit_test_suite(int, char*[])
 {
     boost::unit_test::test_suite* test =
         BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased_mix_values");
diff --git a/test/adaptor_test/type_erased_random_access.cpp b/test/adaptor_test/type_erased_random_access.cpp
index 5caea9e..39cf1c6 100644
--- a/test/adaptor_test/type_erased_random_access.cpp
+++ b/test/adaptor_test/type_erased_random_access.cpp
@@ -10,11 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
 #include <deque>
 #include <vector>
 
diff --git a/test/adaptor_test/type_erased_single_pass.cpp b/test/adaptor_test/type_erased_single_pass.cpp
index 8ae2fe1..ad0c4ae 100644
--- a/test/adaptor_test/type_erased_single_pass.cpp
+++ b/test/adaptor_test/type_erased_single_pass.cpp
@@ -10,11 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
-#include <algorithm>
 #include <deque>
 #include <list>
 #include <vector>
diff --git a/test/adaptor_test/type_erased_tparam_conv.cpp b/test/adaptor_test/type_erased_tparam_conv.cpp
index 4342f99..e235ab3 100644
--- a/test/adaptor_test/type_erased_tparam_conv.cpp
+++ b/test/adaptor_test/type_erased_tparam_conv.cpp
@@ -10,10 +10,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/value_type.hpp>
-#include <boost/array.hpp>
-#include <boost/cstdint.hpp>
-
 #include <algorithm>
 #include <vector>