diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 013e8d2..a7b479a 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -57,6 +57,7 @@ test-suite range :
     [ range-test adaptor_test/type_erased_single_pass ]
     [ range-test adaptor_test/type_erased_forward ]
     [ range-test adaptor_test/type_erased_bidirectional ]
+    [ range-test adaptor_test/type_erased_random_access ]
     [ range-test adaptor_test/uniqued ]
     [ range-test adaptor_test/adjacent_filtered_example ]
     [ range-test adaptor_test/copied_example ]
diff --git a/test/adaptor_test/type_erased.cpp b/test/adaptor_test/type_erased.cpp
index 8752df9..aad2f27 100644
--- a/test/adaptor_test/type_erased.cpp
+++ b/test/adaptor_test/type_erased.cpp
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <list>
-#include <deque>
 #include <vector>
 
 namespace boost_range_adaptor_type_erased_test
@@ -33,26 +32,17 @@ void test_type_erased()
     test_driver< std::vector<MockType> >();
 }
 
-void test_type_erased_random_access()
-{
-    test_type_erased_exercise_buffer_types< std::deque<int>, boost::random_access_traversal_tag >();
-    test_type_erased_exercise_buffer_types< std::vector<int>, boost::random_access_traversal_tag >();
-
-    test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::random_access_traversal_tag >();
-    test_type_erased_exercise_buffer_types< std::vector<MockType>, 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[])
 {
-    boost::unit_test::test_suite* test
-        = BOOST_TEST_SUITE( "RangeTestSuite.adaptor.type_erased" );
+    boost::unit_test::test_suite* test =
+        BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased");
 
-    test->add( BOOST_TEST_CASE( &boost_range_adaptor_type_erased_test::test_type_erased ) );
-    test->add( BOOST_TEST_CASE( &boost_range_adaptor_type_erased_test::test_type_erased_random_access ) );
+    test->add(BOOST_TEST_CASE(
+                &boost_range_adaptor_type_erased_test::test_type_erased));
 
     return test;
 }
diff --git a/test/adaptor_test/type_erased_random_access.cpp b/test/adaptor_test/type_erased_random_access.cpp
new file mode 100644
index 0000000..5caea9e
--- /dev/null
+++ b/test/adaptor_test/type_erased_random_access.cpp
@@ -0,0 +1,55 @@
+// Boost.Range library
+//
+//  Copyright Neil Groves 2014. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//
+#include <boost/range/adaptor/type_erased.hpp>
+#include "type_erased_test.hpp"
+
+#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>
+
+namespace boost_range_adaptor_type_erased_test
+{
+    namespace
+    {
+
+void test_random_access()
+{
+    test_type_erased_exercise_buffer_types<
+            std::deque<int>, boost::random_access_traversal_tag >();
+
+    test_type_erased_exercise_buffer_types<
+            std::vector<int>, boost::random_access_traversal_tag >();
+
+    test_type_erased_exercise_buffer_types<
+            std::deque<MockType>, boost::random_access_traversal_tag >();
+
+    test_type_erased_exercise_buffer_types<
+            std::vector<MockType>, 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[])
+{
+    boost::unit_test::test_suite* test =
+        BOOST_TEST_SUITE("RangeTestSuite.adaptor.type_erased_random_access");
+
+    test->add(BOOST_TEST_CASE(
+            &boost_range_adaptor_type_erased_test::test_random_access));
+
+    return test;
+}
+