diff --git a/test/iterator_pair.cpp b/test/iterator_pair.cpp
index db82f64..094a7c2 100755
--- a/test/iterator_pair.cpp
+++ b/test/iterator_pair.cpp
@@ -52,7 +52,9 @@ void check_iterator_pair()
     BOOST_STATIC_ASSERT(( is_same< range_value<const_pair_tt>::type, 
                           detail::iterator_traits<const_pair_t::first_type>::value_type>::value ));
     BOOST_STATIC_ASSERT(( is_same< range_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));
-    BOOST_STATIC_ASSERT(( is_same< range_const_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));
+    //
+    // This behavior is not supported with v2.
+    //BOOST_STATIC_ASSERT(( is_same< range_const_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_difference<const_pair_tt>::type,                           
                           detail::iterator_traits<const_pair_tt::first_type>::difference_type >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_size<const_pair_tt>::type, std::size_t >::value ));
diff --git a/test/reversible_range.cpp b/test/reversible_range.cpp
index c3d943e..9dfe8d0 100755
--- a/test/reversible_range.cpp
+++ b/test/reversible_range.cpp
@@ -53,10 +53,10 @@ void check_iterator()
     BOOST_CHECK( std::distance( begin( p ), end( p ) ) == std::distance( rbegin( rp ), rend( rp ) ) );
 
 
-    BOOST_CHECK_EQUAL( &*begin( a ), &*( rend( a ) ) );
-    BOOST_CHECK_EQUAL( &*( end( a ) ), &*rbegin( a ) );
-    BOOST_CHECK_EQUAL( &*begin( ca ), &*( rend( ca ) ) );
-    BOOST_CHECK_EQUAL( &*( end( ca ) ), &*rbegin( ca ) );
+    BOOST_CHECK_EQUAL( &*begin( a ), &*( rend( a ) - 1 ) );
+    BOOST_CHECK_EQUAL( &*( end( a ) - 1 ), &*rbegin( a ) );
+    BOOST_CHECK_EQUAL( &*begin( ca ), &*( rend( ca ) - 1 ) );
+    BOOST_CHECK_EQUAL( &*( end( ca ) - 1 ), &*rbegin( ca ) );
 }
 
 
diff --git a/test/sub_range.cpp b/test/sub_range.cpp
index 0b28fc1..ccc2a89 100755
--- a/test/sub_range.cpp
+++ b/test/sub_range.cpp
@@ -90,17 +90,21 @@ void check_sub_range()
     s.empty();
     r.size();
     s.size();
-    
-    irange singular_irange;
-    BOOST_CHECK( singular_irange.empty() );
-    BOOST_CHECK( singular_irange.size() == 0 );
-    
-    srange singular_srange;
-    BOOST_CHECK( singular_srange.empty() );
-    BOOST_CHECK( singular_srange.size() == 0 );
 
-    BOOST_CHECK( empty( singular_irange ) );
-    BOOST_CHECK( empty( singular_srange ) );
+    //
+    // As of range v2 not legal anymore.
+    //
+    //irange singular_irange;
+    //BOOST_CHECK( singular_irange.empty() );
+    //BOOST_CHECK( singular_irange.size() == 0 );
+    //
+    //srange singular_srange;
+    //BOOST_CHECK( singular_srange.empty() );
+    //BOOST_CHECK( singular_srange.size() == 0 );
+    //
+    //BOOST_CHECK( empty( singular_irange ) );
+    //BOOST_CHECK( empty( singular_srange ) );
+    //
 
     srange rr = make_iterator_range( str );
     BOOST_CHECK( rr.equal( r ) );