diff --git a/test/algorithm.cpp b/test/algorithm.cpp
index 2160eaf..ebe0496 100644
--- a/test/algorithm.cpp
+++ b/test/algorithm.cpp
@@ -107,12 +107,15 @@ template<typename Rng>
 void test_random_algorithms(Rng & rng, std::random_access_iterator_tag)
 {
     typedef BOOST_DEDUCED_TYPENAME boost::range_iterator<Rng>::type iterator;
-    typedef BOOST_DEDUCED_TYPENAME boost::range_value<Rng>::type value_type;
-    typedef BOOST_DEDUCED_TYPENAME boost::range_size<Rng>::type size_type BOOST_RANGE_UNUSED;
-    typedef BOOST_DEDUCED_TYPENAME boost::iterator_category<iterator>::type iterator_category;
 
-    
-    
+    typedef BOOST_DEDUCED_TYPENAME boost::range_value<Rng>::type value_type;
+
+    typedef BOOST_DEDUCED_TYPENAME boost::range_size<Rng>::type
+                                        size_type BOOST_RANGE_UNUSED;
+
+    typedef BOOST_DEDUCED_TYPENAME boost::iterator_category<iterator>::type
+                                        iterator_category BOOST_RANGE_UNUSED;
+
     // just make sure these compile (for now)
     if(0)
     {
diff --git a/test/algorithm_test/inplace_merge.cpp b/test/algorithm_test/inplace_merge.cpp
index d0cad73..948e95e 100644
--- a/test/algorithm_test/inplace_merge.cpp
+++ b/test/algorithm_test/inplace_merge.cpp
@@ -28,7 +28,9 @@ namespace boost
         void test(Container1& cont1, Container2& cont2)
         {
             typedef BOOST_DEDUCED_TYPENAME Container1::value_type value_t;
-            typedef BOOST_DEDUCED_TYPENAME std::vector<value_t>::iterator iterator_t;
+
+            typedef BOOST_DEDUCED_TYPENAME std::vector<value_t>::iterator
+                                                iterator_t BOOST_RANGE_UNUSED;
 
             std::vector<value_t> reference_target(cont1.begin(), cont1.end());
             reference_target.insert(reference_target.end(),
@@ -74,7 +76,8 @@ namespace boost
         void test_pred(Container1 cont1, Container2 cont2, BinaryPredicate pred)
         {
             typedef BOOST_DEDUCED_TYPENAME Container1::value_type value_t;
-            typedef BOOST_DEDUCED_TYPENAME std::vector<value_t>::iterator iterator_t;
+            typedef BOOST_DEDUCED_TYPENAME std::vector<value_t>::iterator
+                                                iterator_t BOOST_RANGE_UNUSED;
 
             sort_container(cont1, pred);
             sort_container(cont2, pred);
diff --git a/test/algorithm_test/max_element.cpp b/test/algorithm_test/max_element.cpp
index 9a26099..d4e87d5 100644
--- a/test/algorithm_test/max_element.cpp
+++ b/test/algorithm_test/max_element.cpp
@@ -106,8 +106,11 @@ namespace boost_range_test_algorithm_max_element
     {
         using namespace boost::assign;
 
-        typedef BOOST_DEDUCED_TYPENAME Container::value_type value_t;
-        typedef BOOST_DEDUCED_TYPENAME boost::remove_const<Container>::type container_t;
+        typedef BOOST_DEDUCED_TYPENAME Container::value_type
+                                                value_t BOOST_RANGE_UNUSED;
+
+        typedef BOOST_DEDUCED_TYPENAME boost::remove_const<Container>::type
+                                                container_t;
 
         boost::range_test::range_return_test_driver test_driver;
 
diff --git a/test/algorithm_test/min_element.cpp b/test/algorithm_test/min_element.cpp
index 0f9fa68..bb92d2c 100644
--- a/test/algorithm_test/min_element.cpp
+++ b/test/algorithm_test/min_element.cpp
@@ -104,8 +104,11 @@ namespace boost_range_test_algorithm_min_element
     {
         using namespace boost::assign;
 
-        typedef BOOST_DEDUCED_TYPENAME Container::value_type value_t;
-        typedef BOOST_DEDUCED_TYPENAME boost::remove_const<Container>::type container_t;
+        typedef BOOST_DEDUCED_TYPENAME Container::value_type
+                                                value_t BOOST_RANGE_UNUSED;
+
+        typedef BOOST_DEDUCED_TYPENAME boost::remove_const<Container>::type
+                                                container_t;
 
         boost::range_test::range_return_test_driver test_driver;
 
diff --git a/test/algorithm_test/mismatch.cpp b/test/algorithm_test/mismatch.cpp
index 2336e59..407b5fc 100644
--- a/test/algorithm_test/mismatch.cpp
+++ b/test/algorithm_test/mismatch.cpp
@@ -160,15 +160,17 @@ namespace boost
             MutableContainer2 cont2;
             const Container2& cref_cont2 = cont2;
 
-            typedef BOOST_DEDUCED_TYPENAME Container1::iterator iterator1_t;
-            typedef BOOST_DEDUCED_TYPENAME Container1::const_iterator const_iterator1_t;
-            typedef BOOST_DEDUCED_TYPENAME Container2::iterator iterator2_t;
-            typedef BOOST_DEDUCED_TYPENAME Container2::const_iterator const_iterator2_t;
+            typedef BOOST_DEDUCED_TYPENAME Container1::iterator
+                                        iterator1_t BOOST_RANGE_UNUSED;
 
-            typedef std::pair<iterator1_t,       iterator2_t>       pair_mmit_t;
-            typedef std::pair<const_iterator1_t, iterator2_t>       pair_cmit_t;
-            typedef std::pair<iterator1_t,       const_iterator2_t> pair_mcit_t;
-            typedef std::pair<const_iterator1_t, const_iterator2_t> pair_ccit_t;
+            typedef BOOST_DEDUCED_TYPENAME Container1::const_iterator
+                                        const_iterator1_t BOOST_RANGE_UNUSED;
+
+            typedef BOOST_DEDUCED_TYPENAME Container2::iterator
+                                        iterator2_t BOOST_RANGE_UNUSED;
+
+            typedef BOOST_DEDUCED_TYPENAME Container2::const_iterator
+                                        const_iterator2_t BOOST_RANGE_UNUSED;
 
             eval_mismatch(cont1, cont2, cont1.end(), cont2.end());
             eval_mismatch(cont1, cont2, std::equal_to<int>(), cont1.end(), cont2.end());
diff --git a/test/algorithm_test/random_shuffle.cpp b/test/algorithm_test/random_shuffle.cpp
index 410749a..71915ee 100644
--- a/test/algorithm_test/random_shuffle.cpp
+++ b/test/algorithm_test/random_shuffle.cpp
@@ -90,7 +90,8 @@ namespace boost
         template<class Container>
         void test_random_shuffle_nogen_impl(Container& cont)
         {
-            typedef BOOST_DEDUCED_TYPENAME range_iterator<Container>::type iterator_t;
+            typedef BOOST_DEDUCED_TYPENAME range_iterator<Container>::type
+                                                iterator_t BOOST_RANGE_UNUSED;
 
             const int MAX_RETRIES = 10000;
 
diff --git a/test/algorithm_test/remove_copy.cpp b/test/algorithm_test/remove_copy.cpp
index 4050ef4..b3eb8e2 100644
--- a/test/algorithm_test/remove_copy.cpp
+++ b/test/algorithm_test/remove_copy.cpp
@@ -36,7 +36,8 @@ namespace
         typedef typename boost::range_value<Container>::type value_type;
         std::vector<value_type> reference;
 
-        typedef BOOST_DEDUCED_TYPENAME std::vector<value_type>::iterator iterator_t;
+        typedef BOOST_DEDUCED_TYPENAME std::vector<value_type>::iterator
+                                            iterator_t BOOST_RANGE_UNUSED;
 
         test_append(
             std::remove_copy(c.begin(), c.end(),
diff --git a/test/algorithm_test/replace_copy.cpp b/test/algorithm_test/replace_copy.cpp
index 6ae12e2..5629856 100644
--- a/test/algorithm_test/replace_copy.cpp
+++ b/test/algorithm_test/replace_copy.cpp
@@ -38,7 +38,8 @@ namespace
         typedef typename boost::range_value<Container>::type value_type;
         std::vector<value_type> reference;
 
-        typedef BOOST_DEDUCED_TYPENAME std::vector<value_type>::iterator iterator_t;
+        typedef BOOST_DEDUCED_TYPENAME std::vector<value_type>::iterator
+                                            iterator_t BOOST_RANGE_UNUSED;
 
         test_append(
             std::replace_copy(c.begin(), c.end(),
diff --git a/test/algorithm_test/rotate_copy.cpp b/test/algorithm_test/rotate_copy.cpp
index 5615479..05aa4d2 100644
--- a/test/algorithm_test/rotate_copy.cpp
+++ b/test/algorithm_test/rotate_copy.cpp
@@ -31,11 +31,14 @@ namespace
     template<class Container, class Iterator>
     void test_rotate_copy_impl(Container& cont, Iterator where_it)
     {
-        typedef BOOST_DEDUCED_TYPENAME boost::range_value<Container>::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME boost::range_value<Container>::type
+                                            value_type;
+
         std::vector<value_type> reference;
         std::vector<value_type> test;
 
-        typedef BOOST_DEDUCED_TYPENAME boost::range_iterator<Container>::type iterator_t;
+        typedef BOOST_DEDUCED_TYPENAME boost::range_iterator<Container>::type
+                                            iterator_t BOOST_RANGE_UNUSED;
 
         test_append(
             std::rotate_copy(cont.begin(), where_it, cont.end(),
diff --git a/test/algorithm_test/search_n.cpp b/test/algorithm_test/search_n.cpp
index 246d397..76f5b78 100644
--- a/test/algorithm_test/search_n.cpp
+++ b/test/algorithm_test/search_n.cpp
@@ -60,7 +60,9 @@ namespace
                        Integer count, const Value& value,
                        BinaryPredicate pred)
     {
-        typedef typename std::iterator_traits<ForwardIterator>::iterator_category cat_t;
+        typedef typename std::iterator_traits<
+            ForwardIterator
+        >::iterator_category cat_t BOOST_RANGE_UNUSED;
 
         if (count <= 0)
             return first;
diff --git a/test/compat3.cpp b/test/compat3.cpp
index 5249c58..e4e4c83 100644
--- a/test/compat3.cpp
+++ b/test/compat3.cpp
@@ -10,6 +10,7 @@
 
 #include <boost/static_assert.hpp>
 #include <boost/type_traits.hpp>
+#include <boost/concept_check.hpp>
 #include <boost/config.hpp>
 
 enum Container {};
@@ -51,6 +52,7 @@ void compat1()
 {
     std::vector<int> v;
     iterator_of< std::vector<int> >::type i = v.begin();
+    boost::ignore_unused_variable_warning(i);
 }
 
 #include <boost/test/included/unit_test.hpp> 
diff --git a/test/iterator_pair.cpp b/test/iterator_pair.cpp
index 997b5fb..ba13d75 100644
--- a/test/iterator_pair.cpp
+++ b/test/iterator_pair.cpp
@@ -63,18 +63,24 @@ void check_iterator_pair()
     BOOST_CHECK( boost::begin( pair ) == pair.first );
     BOOST_CHECK( boost::end( pair )   == pair.second );
     BOOST_CHECK( boost::empty( pair ) == (pair.first == pair.second) );
-    BOOST_CHECK( boost::size( pair )  == std::distance( pair.first, pair.second ) );
+    BOOST_CHECK( boost::size( pair )  ==
+                    static_cast<std::size_t>(
+                        std::distance(pair.first, pair.second)) );
 
     BOOST_CHECK( boost::begin( const_pair ) == const_pair.first );
     BOOST_CHECK( boost::end( const_pair )   == const_pair.second );
     BOOST_CHECK( boost::empty( const_pair ) == (const_pair.first == const_pair.second) );
-    BOOST_CHECK( boost::size( const_pair )  == std::distance( const_pair.first, const_pair.second ) );
+    BOOST_CHECK( boost::size( const_pair )  ==
+                    static_cast<std::size_t>(
+                        std::distance(const_pair.first, const_pair.second)) );
 
     BOOST_CHECK( boost::begin( constness_pair ) == constness_pair.first );
     BOOST_CHECK( boost::end( constness_pair )   == constness_pair.second );
     BOOST_CHECK( boost::empty( constness_pair ) == (constness_pair.first == const_pair.second) );
-    BOOST_CHECK( boost::size( constness_pair )  == std::distance( constness_pair.first, constness_pair.second ) );
-
+    BOOST_CHECK( boost::size( constness_pair )  ==
+                    static_cast<std::size_t>(
+                        std::distance(constness_pair.first,
+                                      constness_pair.second)) );
 }