diff --git a/test/Jamfile b/test/Jamfile
index 7a7e7186..4dd815c4 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -154,18 +154,18 @@ import testing ;
     # Text for extension features, must be explicitly specified on the command line to be run
     # TODO these are not in a test-suite because currently test-suites cannot be marked "explicit"
 
-    run algorithm/ext_/for_each_s.cpp ;
-    explicit for_each_s ;
+    run algorithm/segmented_for_each.cpp ;
+    explicit segmented_for_each ;
 
-    run algorithm/ext_/find_s.cpp ;
-    explicit find_s ;
+    run algorithm/segmented_find.cpp ;
+    explicit segmented_find ;
 
-    run algorithm/ext_/find_if_s.cpp ;
-    explicit find_if_s ;
+    run algorithm/segmented_find_if.cpp ;
+    explicit segmented_find_if ;
 
-    run algorithm/ext_/fold_s.cpp ;
-    explicit fold_s ;
+    run algorithm/segmented_fold.cpp ;
+    explicit segmented_fold ;
 
-    run sequence/ext_/iterator_range_s.cpp ;
-    explicit iterator_range_s ;
+    run sequence/segmented_iterator_range.cpp ;
+    explicit segmented_iterator_range ;
 }
diff --git a/test/algorithm/ext_/find_s.cpp b/test/algorithm/segmented_find.cpp
similarity index 97%
rename from test/algorithm/ext_/find_s.cpp
rename to test/algorithm/segmented_find.cpp
index 6c7428b8..a334c222 100644
--- a/test/algorithm/ext_/find_s.cpp
+++ b/test/algorithm/segmented_find.cpp
@@ -8,8 +8,8 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_s.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/container/generation/make_vector.hpp>
+#include "../sequence/tree.hpp"
 
 struct not_there {};
 
diff --git a/test/algorithm/ext_/find_if_s.cpp b/test/algorithm/segmented_find_if.cpp
similarity index 97%
rename from test/algorithm/ext_/find_if_s.cpp
rename to test/algorithm/segmented_find_if.cpp
index d25dc0e6..ff7ed888 100644
--- a/test/algorithm/ext_/find_if_s.cpp
+++ b/test/algorithm/segmented_find_if.cpp
@@ -8,10 +8,10 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/mpl/placeholders.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "../sequence/tree.hpp"
 
 struct not_there {};
 
diff --git a/test/algorithm/ext_/fold_s.cpp b/test/algorithm/segmented_fold.cpp
similarity index 97%
rename from test/algorithm/ext_/fold_s.cpp
rename to test/algorithm/segmented_fold.cpp
index f774c2a4..6375473e 100644
--- a/test/algorithm/ext_/fold_s.cpp
+++ b/test/algorithm/segmented_fold.cpp
@@ -10,8 +10,8 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/fold_s.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/container/generation/make_vector.hpp>
+#include "../sequence/tree.hpp"
 
 struct write_string
 {
diff --git a/test/algorithm/ext_/for_each_s.cpp b/test/algorithm/segmented_for_each.cpp
similarity index 96%
rename from test/algorithm/ext_/for_each_s.cpp
rename to test/algorithm/segmented_for_each.cpp
index 9467a101..3d1e4a60 100644
--- a/test/algorithm/ext_/for_each_s.cpp
+++ b/test/algorithm/segmented_for_each.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/fusion/container/generation/make_vector.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
+#include "../sequence/tree.hpp"
 
 struct print
 {
diff --git a/test/sequence/ext_/iterator_range_s.cpp b/test/sequence/segmented_iterator_range.cpp
similarity index 98%
rename from test/sequence/ext_/iterator_range_s.cpp
rename to test/sequence/segmented_iterator_range.cpp
index 33c63446..7a6e5830 100644
--- a/test/sequence/ext_/iterator_range_s.cpp
+++ b/test/sequence/segmented_iterator_range.cpp
@@ -5,11 +5,11 @@
     Distributed under 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 <sstream>
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp>
@@ -20,7 +20,7 @@
 #include <boost/mpl/begin.hpp>
 #include <boost/mpl/next.hpp>
 #include <boost/static_assert.hpp>
-#include <sstream>
+#include "tree.hpp"
 
 struct ostream_fun
 {
diff --git a/include/boost/fusion/container/ext_/tree.hpp b/test/sequence/tree.hpp
similarity index 100%
rename from include/boost/fusion/container/ext_/tree.hpp
rename to test/sequence/tree.hpp