diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 1e817c7..a0c10e0 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -55,6 +55,7 @@ test-suite range :
     [ range-test adaptor_test/type_erased_mix_values ]
     [ range-test adaptor_test/type_erased_tparam_conv ]
     [ range-test adaptor_test/type_erased_single_pass ]
+    [ range-test adaptor_test/type_erased_bidirectional ]
     [ 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 f95ed68..e2b2b9b 100644
--- a/test/adaptor_test/type_erased.cpp
+++ b/test/adaptor_test/type_erased.cpp
@@ -10,15 +10,13 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <boost/range/algorithm_ext.hpp>
-#include <boost/range/algorithm/fill.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/array.hpp>
 #include <boost/cstdint.hpp>
 
 #include <algorithm>
 #include <list>
-#include <set>
+#include <deque>
 #include <vector>
 
 namespace boost_range_adaptor_type_erased_test
@@ -46,17 +44,6 @@ void test_type_erased_forward()
     test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::forward_traversal_tag >();
 }
 
-void test_type_erased_bidirectional()
-{
-    test_type_erased_exercise_buffer_types< std::list<int>, boost::bidirectional_traversal_tag >();
-    test_type_erased_exercise_buffer_types< std::deque<int>, boost::bidirectional_traversal_tag >();
-    test_type_erased_exercise_buffer_types< std::vector<int>, boost::bidirectional_traversal_tag >();
-
-    test_type_erased_exercise_buffer_types< std::list<MockType>, boost::bidirectional_traversal_tag >();
-    test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::bidirectional_traversal_tag >();
-    test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::bidirectional_traversal_tag >();
-}
-
 void test_type_erased_random_access()
 {
     test_type_erased_exercise_buffer_types< std::deque<int>, boost::random_access_traversal_tag >();
@@ -77,7 +64,6 @@ init_unit_test_suite(int argc, char* argv[])
 
     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_forward ) );
-    test->add( BOOST_TEST_CASE( &boost_range_adaptor_type_erased_test::test_type_erased_bidirectional ) );
     test->add( BOOST_TEST_CASE( &boost_range_adaptor_type_erased_test::test_type_erased_random_access ) );
 
     return test;
diff --git a/test/adaptor_test/type_erased_bidirectional.cpp b/test/adaptor_test/type_erased_bidirectional.cpp
new file mode 100644
index 0000000..94ed740
--- /dev/null
+++ b/test/adaptor_test/type_erased_bidirectional.cpp
@@ -0,0 +1,52 @@
+// 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 <list>
+#include <deque>
+#include <vector>
+
+namespace boost_range_adaptor_type_erased_test
+{
+    namespace
+    {
+
+void test_bidirectional()
+{
+    test_type_erased_exercise_buffer_types< std::list<int>, boost::bidirectional_traversal_tag >();
+    test_type_erased_exercise_buffer_types< std::deque<int>, boost::bidirectional_traversal_tag >();
+    test_type_erased_exercise_buffer_types< std::vector<int>, boost::bidirectional_traversal_tag >();
+
+    test_type_erased_exercise_buffer_types< std::list<MockType>, boost::bidirectional_traversal_tag >();
+    test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::bidirectional_traversal_tag >();
+    test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::bidirectional_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_bidirectional");
+
+    test->add(BOOST_TEST_CASE(
+                  &boost_range_adaptor_type_erased_test::test_bidirectional));
+
+    return test;
+}
+