diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp
index bb8c7cb3..819ec009 100644
--- a/test/sequence/adapt_struct.cpp
+++ b/test/sequence/adapt_struct.cpp
@@ -4,8 +4,6 @@
     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)
 ==============================================================================*/
-#define BOOST_PP_VARIADICS 1
-
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
@@ -51,32 +49,59 @@ namespace ns
     private:
         int x;
         int y;
+        int z;
 
     public:
-        point_with_private_attributes(int x, int y):x(x),y(y)
+        point_with_private_attributes(int x, int y, int z):x(x),y(y),z(z)
         {}
     };
 #endif
 }
 
-BOOST_FUSION_ADAPT_STRUCT(
-    ns::point,
-    (int, x)
-    (BOOST_FUSION_ADAPT_AUTO, y)
-    (, z)
-)
+#if BOOST_PP_VARIADICS
+
+    BOOST_FUSION_ADAPT_STRUCT(
+        ns::point,
+        x,
+        y,
+        z
+    )
+
+#   if !BOOST_WORKAROUND(__GNUC__,<4)
+    BOOST_FUSION_ADAPT_STRUCT(
+        ns::point_with_private_attributes,
+        x,
+        y,
+        z
+    )
+#   endif
+
+    struct s { int m; };
+    BOOST_FUSION_ADAPT_STRUCT(s, m)
+
+#else // BOOST_PP_VARIADICS
+
+    BOOST_FUSION_ADAPT_STRUCT(
+        ns::point,
+        (int, x)
+        (int, y)
+        (BOOST_FUSION_ADAPT_AUTO, z)
+    )
+
+#   if !BOOST_WORKAROUND(__GNUC__,<4)
+    BOOST_FUSION_ADAPT_STRUCT(
+        ns::point_with_private_attributes,
+        (int, x)
+        (int, y)
+        (BOOST_FUSION_ADAPT_AUTO, z)
+    )
+#   endif
+
+    struct s { int m; };
+    BOOST_FUSION_ADAPT_STRUCT(s, (BOOST_FUSION_ADAPT_AUTO, m))
 
-#if !BOOST_WORKAROUND(__GNUC__,<4)
-BOOST_FUSION_ADAPT_STRUCT(
-    ns::point_with_private_attributes,
-    (int, x)
-    (int, y)
-)
 #endif
 
-struct s { int m; };
-BOOST_FUSION_ADAPT_STRUCT(s, (int, m))
-
 int
 main()
 {
@@ -88,29 +113,31 @@ main()
     std::cout << tuple_delimiter(", ");
 
     {
-        BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
-        ns::point p = {123, 456};
+        BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
+        point p = {123, 456, 789};
 
         std::cout << at_c<0>(p) << std::endl;
         std::cout << at_c<1>(p) << std::endl;
+        std::cout << at_c<2>(p) << std::endl;
         std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456, 4));
+        BOOST_TEST(p == make_vector(123, 456, 789));
 
         at_c<0>(p) = 6;
         at_c<1>(p) = 9;
+        at_c<2>(p) = 12;
         BOOST_TEST(p == make_vector(6, 9, 12));
 
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 3);
-        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);
+        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 3);
+        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);
 
         BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
+        BOOST_TEST(back(p) == 12);
     }
 
     {
-        fusion::vector<int, float, int> v1(4, 2, 3);
-        ns::point v2 = {5, 3, 2};
-        fusion::vector<long, double, int> v3(5, 4, 2);
+        vector<int, float, int> v1(4, 2, 2);
+        point v2 = {5, 3, 3};
+        vector<long, double, int> v3(5, 4, 4);
         BOOST_TEST(v1 < v2);
         BOOST_TEST(v1 <= v2);
         BOOST_TEST(v2 > v1);
@@ -122,16 +149,16 @@ main()
     }
 
     {
-        // conversion from ns::point to vector
-        ns::point p = {5, 3, 4};
-        fusion::vector<int, long, int> v(p);
+        // conversion from point to vector
+        point p = {5, 3, 3};
+        vector<int, long, int> v(p);
         v = p;
     }
 
     {
-        // conversion from ns::point to list
-        ns::point p = {5, 3, 4};
-        fusion::list<int, long, int> l(p);
+        // conversion from point to list
+        point p = {5, 3, 3};
+        list<int, long> l(p);
         l = p;
     }
 
@@ -154,12 +181,13 @@ main()
 
 #if !BOOST_WORKAROUND(__GNUC__,<4)
     {
-        ns::point_with_private_attributes p(123, 456);
+        ns::point_with_private_attributes p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;
         std::cout << at_c<1>(p) << std::endl;
+        std::cout << at_c<2>(p) << std::endl;
         std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
+        BOOST_TEST(p == make_vector(123, 456, 789));
     }
 #endif
 
diff --git a/test/sequence/adapt_tpl_struct.cpp b/test/sequence/adapt_tpl_struct.cpp
index 1c0ae6d6..86face6d 100644
--- a/test/sequence/adapt_tpl_struct.cpp
+++ b/test/sequence/adapt_tpl_struct.cpp
@@ -35,19 +35,40 @@ namespace ns
     {
         X x;
         Y y;
+        int z;
     };
 }
 
-BOOST_FUSION_ADAPT_TPL_STRUCT(
-    (X)(Y),
-    (ns::point)(X)(Y),
-    (BOOST_FUSION_ADAPT_AUTO, x)
-    (Y, y)
-)
+#if BOOST_PP_VARIADICS
+
+    BOOST_FUSION_ADAPT_TPL_STRUCT(
+        (X)(Y),
+        (ns::point)(X)(Y),
+        x,
+        (BOOST_FUSION_ADAPT_AUTO, y)
+        (int, z)
+    )
+
+    template<typename M>
+    struct s { M m; };
+    BOOST_FUSION_ADAPT_TPL_STRUCT((M), (s)(M), m)
+
+#else // BOOST_PP_VARIADICS
+
+    BOOST_FUSION_ADAPT_TPL_STRUCT(
+        (X)(Y),
+        (ns::point)(X)(Y),
+        (X, x)
+        (Y, y)
+        (BOOST_FUSION_ADAPT_AUTO, z)
+    )
+
+    template<typename M>
+    struct s { M m; };
+    BOOST_FUSION_ADAPT_TPL_STRUCT((M), (s)(M), (BOOST_FUSION_ADAPT_AUTO, m))
+
+#endif
 
-template<typename M>
-struct s { M m; };
-BOOST_FUSION_ADAPT_TPL_STRUCT((M), (s)(M), (M, m))
 
 int
 main()
@@ -62,28 +83,30 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
-        point p = {123, 456};
+        point p = {123, 456, 789};
 
         std::cout << at_c<0>(p) << std::endl;
         std::cout << at_c<1>(p) << std::endl;
+        std::cout << at_c<2>(p) << std::endl;
         std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
+        BOOST_TEST(p == make_vector(123, 456, 789));
 
         at_c<0>(p) = 6;
         at_c<1>(p) = 9;
-        BOOST_TEST(p == make_vector(6, 9));
+        at_c<2>(p) = 12;
+        BOOST_TEST(p == make_vector(6, 9, 12));
 
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 3);
         BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);
 
         BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
+        BOOST_TEST(back(p) == 12);
     }
 
     {
-        vector<int, float> v1(4, 2);
-        point v2 = {5, 3};
-        vector<long, double> v3(5, 4);
+        vector<int, float, int> v1(4, 2, 2);
+        point v2 = {5, 3, 3};
+        vector<long, double, int> v3(5, 4, 4);
         BOOST_TEST(v1 < v2);
         BOOST_TEST(v1 <= v2);
         BOOST_TEST(v2 > v1);
@@ -96,14 +119,14 @@ main()
 
     {
         // conversion from point to vector
-        point p = {5, 3};
-        vector<int, long> v(p);
+        point p = {5, 3, 3};
+        vector<int, long, int> v(p);
         v = p;
     }
 
     {
         // conversion from point to list
-        point p = {5, 3};
+        point p = {5, 3, 3};
         list<int, long> l(p);
         l = p;
     }
diff --git a/test/sequence/auto_adapt_assoc_struct.cpp b/test/sequence/auto_adapt_assoc_struct.cpp
deleted file mode 100644
index 177df20b..00000000
--- a/test/sequence/auto_adapt_assoc_struct.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-    Copyright (c) 2005-2007 Dan Marsden
-
-    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 <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/struct/auto_adapt_assoc_struct.hpp>
-#include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/intrinsic/empty.hpp>
-#include <boost/fusion/sequence/intrinsic/front.hpp>
-#include <boost/fusion/sequence/intrinsic/back.hpp>
-#include <boost/fusion/sequence/intrinsic/has_key.hpp>
-#include <boost/fusion/sequence/intrinsic/at_key.hpp>
-#include <boost/fusion/sequence/intrinsic/value_at.hpp>
-#include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
-#include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
-#include <boost/fusion/container/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/comparison/not_equal_to.hpp>
-#include <boost/fusion/sequence/comparison/less.hpp>
-#include <boost/fusion/sequence/comparison/less_equal.hpp>
-#include <boost/fusion/sequence/comparison/greater.hpp>
-#include <boost/fusion/sequence/comparison/greater_equal.hpp>
-#include <boost/fusion/mpl.hpp>
-#include <boost/fusion/support/is_view.hpp>
-#include <boost/mpl/front.hpp>
-#include <boost/mpl/is_sequence.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/not.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <iostream>
-#include <string>
-
-namespace ns
-{
-    struct x_member;
-    struct y_member;
-    struct z_member;
-
-    struct point
-    {
-        int x;
-        int y;
-    };
-}
-
-BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT(
-    ns::point,
-    (x, ns::x_member)
-    (y, ns::y_member)
-)
-
-int
-main()
-{
-    using namespace boost::fusion;
-    using namespace boost;
-
-    std::cout << tuple_open('[');
-    std::cout << tuple_close(']');
-    std::cout << tuple_delimiter(", ");
-
-    {
-        BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
-        ns::point p = {123, 456};
-
-        std::cout << at_c<0>(p) << std::endl;
-        std::cout << at_c<1>(p) << std::endl;
-        std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
-
-        at_c<0>(p) = 6;
-        at_c<1>(p) = 9;
-        BOOST_TEST(p == make_vector(6, 9));
-
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
-        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);
-
-        BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
-    }
-
-    {
-        fusion::vector<int, float> v1(4, 2);
-        ns::point v2 = {5, 3};
-        fusion::vector<long, double> v3(5, 4);
-        BOOST_TEST(v1 < v2);
-        BOOST_TEST(v1 <= v2);
-        BOOST_TEST(v2 > v1);
-        BOOST_TEST(v2 >= v1);
-        BOOST_TEST(v2 < v3);
-        BOOST_TEST(v2 <= v3);
-        BOOST_TEST(v3 > v2);
-        BOOST_TEST(v3 >= v2);
-    }
-
-    {
-        // conversion from ns::point to vector
-        ns::point p = {5, 3};
-        fusion::vector<int, long> v(p);
-        v = p;
-    }
-
-    {
-        // conversion from ns::point to list
-        ns::point p = {5, 3};
-        fusion::list<int, long> l(p);
-        l = p;
-    }
-
-    {
-        // assoc stuff
-        BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::x_member>));
-        BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::y_member>));
-        BOOST_MPL_ASSERT((mpl::not_<boost::fusion::result_of::has_key<ns::point, ns::z_member> >));
-
-        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int>));
-        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int>));
-
-        ns::point p = {5, 3};
-        
-        BOOST_TEST(at_key<ns::x_member>(p) == 5);
-        BOOST_TEST(at_key<ns::y_member>(p) == 3);
-    }
-
-    {
-        BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
-        BOOST_MPL_ASSERT((boost::is_same<
-            boost::fusion::result_of::value_at_c<ns::point,0>::type
-          , mpl::front<ns::point>::type>));
-    }
-
-    return boost::report_errors();
-}
-
diff --git a/test/sequence/auto_adapt_assoc_struct_named.cpp b/test/sequence/auto_adapt_assoc_struct_named.cpp
deleted file mode 100644
index b2e85541..00000000
--- a/test/sequence/auto_adapt_assoc_struct_named.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2010 Christopher Schmidt
-
-    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 <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence.hpp>
-#include <boost/fusion/support.hpp>
-#include <boost/fusion/container/list.hpp>
-#include <boost/fusion/container/vector.hpp>
-#include <boost/fusion/container/generation/make_vector.hpp>
-#include <boost/fusion/adapted/struct/auto_adapt_assoc_struct_named.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/not.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/static_assert.hpp>
-#include <iostream>
-#include <string>
-
-namespace ns
-{
-    struct x_member;
-    struct y_member;
-    struct z_member;
-
-    struct point
-    {
-        int x;
-        int y;
-    };
-}
-
-BOOST_FUSION_AUTO_ADAPT_ASSOC_STRUCT_NAMED(
-    ns::point,
-    point,
-    (x, ns::x_member)
-    (y, ns::y_member)
-)
-
-int
-main()
-{
-    using namespace boost::fusion;
-
-    std::cout << tuple_open('[');
-    std::cout << tuple_close(']');
-    std::cout << tuple_delimiter(", ");
-
-    {
-        BOOST_MPL_ASSERT((traits::is_view<adapted::point>));
-        ns::point basep = {123, 456};
-        adapted::point p(basep);
-
-        std::cout << at_c<0>(p) << std::endl;
-        std::cout << at_c<1>(p) << std::endl;
-        std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
-
-        at_c<0>(p) = 6;
-        at_c<1>(p) = 9;
-        BOOST_TEST(p == make_vector(6, 9));
-
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<adapted::point>::value == 2);
-        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<adapted::point>::value);
-
-        BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
-    }
-
-    {
-        vector<int, float> v1(4, 2);
-        ns::point basev2 = {5, 3};
-        adapted::point v2(basev2);
-
-        vector<long, double> v3(5, 4);
-        BOOST_TEST(v1 < v2);
-        BOOST_TEST(v1 <= v2);
-        BOOST_TEST(v2 > v1);
-        BOOST_TEST(v2 >= v1);
-        BOOST_TEST(v2 < v3);
-        BOOST_TEST(v2 <= v3);
-        BOOST_TEST(v3 > v2);
-        BOOST_TEST(v3 >= v2);
-    }
-
-    {
-        // conversion from adapted::point to vector
-        ns::point basep = {5, 3};
-        adapted::point p(basep);
-        vector<int, long> v(p);
-        v = p;
-    }
-
-    {
-        // conversion from adapted::point to list
-        ns::point basep = {5, 3};
-        adapted::point p(basep);
-        list<int, long> l(p);
-        l = p;
-    }
-
-    {
-        // assoc stuff
-        BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<adapted::point, ns::x_member>));
-        BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<adapted::point, ns::y_member>));
-        BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<adapted::point, ns::z_member> >));
-
-        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<adapted::point, ns::x_member>::type, int>));
-        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<adapted::point, ns::y_member>::type, int>));
-
-        ns::point basep = {5, 3};
-        adapted::point p(basep);
-        
-        BOOST_TEST(at_key<ns::x_member>(p) == 5);
-        BOOST_TEST(at_key<ns::y_member>(p) == 3);
-    }
-
-    return boost::report_errors();
-}
-
diff --git a/test/sequence/auto_adapt_struct.cpp b/test/sequence/auto_adapt_struct.cpp
deleted file mode 100644
index e7ce2890..00000000
--- a/test/sequence/auto_adapt_struct.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-    Copyright (c) 2013-2014 Damien Buhl
-
-    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 <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/struct/auto_adapt_struct.hpp>
-#include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/intrinsic/empty.hpp>
-#include <boost/fusion/sequence/intrinsic/front.hpp>
-#include <boost/fusion/sequence/intrinsic/back.hpp>
-#include <boost/fusion/sequence/intrinsic/value_at.hpp>
-#include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
-#include <boost/fusion/container/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/comparison/not_equal_to.hpp>
-#include <boost/fusion/sequence/comparison/less.hpp>
-#include <boost/fusion/sequence/comparison/less_equal.hpp>
-#include <boost/fusion/sequence/comparison/greater.hpp>
-#include <boost/fusion/sequence/comparison/greater_equal.hpp>
-#include <boost/fusion/mpl.hpp>
-#include <boost/fusion/support/is_view.hpp>
-#include <boost/mpl/front.hpp>
-#include <boost/mpl/is_sequence.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/static_assert.hpp>
-#include <iostream>
-#include <string>
-
-namespace ns
-{
-    struct point
-    {
-        int x;
-        int y;
-    };
-
-#if !BOOST_WORKAROUND(__GNUC__,<4)
-    struct point_with_private_attributes
-    {
-        friend struct boost::fusion::extension::access;
-
-    private:
-        int x;
-        int y;
-
-    public:
-        point_with_private_attributes(int x, int y):x(x),y(y)
-        {}
-    };
-#endif
-}
-
-/*BOOST_FUSION_AUTO_ADAPT_STRUCT(
-    ns::point,
-    (x)
-    (y)
-)*/
-
-BOOST_FUSION_AUTO_ADAPT_STRUCT(
-    ns::point,
-    x, y
-)
-
-#if !BOOST_WORKAROUND(__GNUC__,<4)
-BOOST_FUSION_AUTO_ADAPT_STRUCT(
-    ns::point_with_private_attributes,
-    (x)
-    (y)
-)
-#endif
-
-struct s { int m; };
-BOOST_FUSION_AUTO_ADAPT_STRUCT(s, (m))
-
-int
-main()
-{
-    using namespace boost::fusion;
-    using namespace boost;
-
-    std::cout << tuple_open('[');
-    std::cout << tuple_close(']');
-    std::cout << tuple_delimiter(", ");
-
-    {
-        BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
-        ns::point p = {123, 456};
-
-        std::cout << at_c<0>(p) << std::endl;
-        std::cout << at_c<1>(p) << std::endl;
-        std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
-
-        at_c<0>(p) = 6;
-        at_c<1>(p) = 9;
-        BOOST_TEST(p == make_vector(6, 9));
-
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
-        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);
-
-        BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
-    }
-
-    {
-        fusion::vector<int, float> v1(4, 2);
-        ns::point v2 = {5, 3};
-        fusion::vector<long, double> v3(5, 4);
-        BOOST_TEST(v1 < v2);
-        BOOST_TEST(v1 <= v2);
-        BOOST_TEST(v2 > v1);
-        BOOST_TEST(v2 >= v1);
-        BOOST_TEST(v2 < v3);
-        BOOST_TEST(v2 <= v3);
-        BOOST_TEST(v3 > v2);
-        BOOST_TEST(v3 >= v2);
-    }
-
-    {
-        // conversion from ns::point to vector
-        ns::point p = {5, 3};
-        fusion::vector<int, long> v(p);
-        v = p;
-    }
-
-    {
-        // conversion from ns::point to list
-        ns::point p = {5, 3};
-        fusion::list<int, long> l(p);
-        l = p;
-    }
-
-    { // begin/end
-        using namespace boost::fusion;
-        using boost::is_same;
-
-        typedef boost::fusion::result_of::begin<s>::type b;
-        typedef boost::fusion::result_of::end<s>::type e;
-        // this fails
-        BOOST_MPL_ASSERT((is_same<boost::fusion::result_of::next<b>::type, e>));
-    }
-
-    {
-        BOOST_MPL_ASSERT((mpl::is_sequence<ns::point>));
-        BOOST_MPL_ASSERT((boost::is_same<
-            boost::fusion::result_of::value_at_c<ns::point,0>::type
-          , mpl::front<ns::point>::type>));
-    }
-
-#if !BOOST_WORKAROUND(__GNUC__,<4)
-    {
-        ns::point_with_private_attributes p(123, 456);
-
-        std::cout << at_c<0>(p) << std::endl;
-        std::cout << at_c<1>(p) << std::endl;
-        std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
-    }
-#endif
-
-    return boost::report_errors();
-}
diff --git a/test/sequence/auto_adapt_struct_named.cpp b/test/sequence/auto_adapt_struct_named.cpp
deleted file mode 100644
index 1ada8efe..00000000
--- a/test/sequence/auto_adapt_struct_named.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-
-    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 <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/adapted/struct/auto_adapt_struct_named.hpp>
-#include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/intrinsic/empty.hpp>
-#include <boost/fusion/sequence/intrinsic/front.hpp>
-#include <boost/fusion/sequence/intrinsic/back.hpp>
-#include <boost/fusion/sequence/intrinsic/value_at.hpp>
-#include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/list/list.hpp>
-#include <boost/fusion/container/generation/make_vector.hpp>
-#include <boost/fusion/container/vector/convert.hpp>
-#include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/comparison/not_equal_to.hpp>
-#include <boost/fusion/sequence/comparison/less.hpp>
-#include <boost/fusion/sequence/comparison/less_equal.hpp>
-#include <boost/fusion/sequence/comparison/greater.hpp>
-#include <boost/fusion/sequence/comparison/greater_equal.hpp>
-#include <boost/fusion/mpl.hpp>
-#include <boost/fusion/support/is_view.hpp>
-#include <boost/mpl/front.hpp>
-#include <boost/mpl/is_sequence.hpp>
-#include <boost/mpl/assert.hpp>
-#include <iostream>
-#include <string>
-
-namespace ns
-{
-    struct point
-    {
-        int x;
-        int y;
-    };
-}
-
-// this creates a fusion view: boost::fusion::adapted::point
-BOOST_FUSION_AUTO_ADAPT_STRUCT_NAMED(
-    ns::point, point,
-    (x)
-    (y)
-)
-
-// this creates a fusion view: ns1::s1
-struct s { int m; };
-BOOST_FUSION_AUTO_ADAPT_STRUCT_NAMED_NS(s, (ns1), s1, (m))
-
-int
-main()
-{
-    using namespace boost::fusion;
-    using namespace boost;
-
-    std::cout << tuple_open('[');
-    std::cout << tuple_close(']');
-    std::cout << tuple_delimiter(", ");
-
-    {
-        BOOST_MPL_ASSERT((traits::is_view<adapted::point>));
-        ns::point basep = {123, 456};
-        adapted::point p(basep);
-
-        std::cout << at_c<0>(p) << std::endl;
-        std::cout << at_c<1>(p) << std::endl;
-        std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
-
-        at_c<0>(p) = 6;
-        at_c<1>(p) = 9;
-        BOOST_TEST(p == make_vector(6, 9));
-
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<adapted::point>::value == 2);
-        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<adapted::point>::value);
-
-        BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
-    }
-
-    {
-        fusion::vector<int, float> v1(4, 2);
-        ns::point p = {5, 3};
-        adapted::point v2(p);
-
-        fusion::vector<long, double> v3(5, 4);
-        BOOST_TEST(v1 < v2);
-        BOOST_TEST(v1 <= v2);
-        BOOST_TEST(v2 > v1);
-        BOOST_TEST(v2 >= v1);
-        BOOST_TEST(v2 < v3);
-        BOOST_TEST(v2 <= v3);
-        BOOST_TEST(v3 > v2);
-        BOOST_TEST(v3 >= v2);
-    }
-
-    {
-        // conversion from adapted::point to vector
-        ns::point basep = {5, 3};
-        adapted::point p(basep);
-        fusion::vector<int, long> v(p);
-        v = p;
-    }
-
-    {
-        // conversion from adapted::point to list
-        ns::point basep = {5, 3};
-        adapted::point p(basep);
-        fusion::list<int, long> l(p);
-        l = p;
-    }
-
-    { // begin/end
-        using namespace boost::fusion;
-        using boost::is_same;
-
-        typedef boost::fusion::result_of::begin<ns1::s1>::type b;
-        typedef boost::fusion::result_of::end<ns1::s1>::type e;
-        // this fails
-        BOOST_MPL_ASSERT((is_same<boost::fusion::result_of::next<b>::type, e>));
-    }
-
-
-    {
-        BOOST_MPL_ASSERT((mpl::is_sequence<adapted::point>));
-        BOOST_MPL_ASSERT((boost::is_same<
-            boost::fusion::result_of::value_at_c<adapted::point,0>::type
-          , mpl::front<adapted::point>::type>));
-    }
-
-    return boost::report_errors();
-}
-