diff --git a/test/_include/auto/drop_front.hpp b/test/_include/auto/drop_front.hpp
index 14e3243b8..05988ace2 100644
--- a/test/_include/auto/drop_front.hpp
+++ b/test/_include/auto/drop_front.hpp
@@ -58,6 +58,23 @@ TestCase test_drop_front{[]{
         MAKE_TUPLE()
     ));
 
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}), hana::size_c<0>),
+        MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})
+    ));
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}), hana::size_c<1>),
+        MAKE_TUPLE(ct_eq<1>{}, ct_eq<2>{})
+    ));
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}), hana::size_c<2>),
+        MAKE_TUPLE(ct_eq<2>{})
+    ));
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}), hana::size_c<3>),
+        MAKE_TUPLE()
+    ));
+
     // make sure hana::drop_front(xs) == hana::drop_front(xs, size_c<1>)
     BOOST_HANA_CHECK(hana::equal(
         hana::drop_front(MAKE_TUPLE()),
@@ -78,6 +95,11 @@ TestCase test_drop_front{[]{
         hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<2>{})),
         hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<2>{}), hana::size_c<1>)
     ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{})),
+        MAKE_TUPLE(ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{})
+    ));
 }};
 
 TestCase test_drop_front_exactly{[]{
diff --git a/test/_include/auto/length.hpp b/test/_include/auto/length.hpp
new file mode 100644
index 000000000..25f75dc4d
--- /dev/null
+++ b/test/_include/auto/length.hpp
@@ -0,0 +1,48 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_HANA_TEST_AUTO_LENGTH_HPP
+#define BOOST_HANA_TEST_AUTO_LENGTH_HPP
+
+#include <boost/hana/assert.hpp>
+#include <boost/hana/equal.hpp>
+#include <boost/hana/integral_constant.hpp>
+#include <boost/hana/length.hpp>
+
+#include "test_case.hpp"
+
+
+namespace _test_length_detail { template <int> struct undefined { }; }
+
+TestCase test_length{[]{
+    namespace hana = boost::hana;
+    using _test_length_detail::undefined;
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::length(MAKE_TUPLE()),
+        hana::size_c<0>
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::length(MAKE_TUPLE(undefined<1>{})),
+        hana::size_c<1>
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::length(MAKE_TUPLE(undefined<1>{}, undefined<2>{})),
+        hana::size_c<2>
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::length(MAKE_TUPLE(undefined<1>{}, undefined<2>{}, undefined<3>{})),
+        hana::size_c<3>
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        hana::length(MAKE_TUPLE(undefined<1>{}, undefined<2>{}, undefined<3>{}, undefined<4>{}, undefined<5>{}, undefined<6>{})),
+        hana::size_c<6>
+    ));
+}};
+
+#endif // !BOOST_HANA_TEST_AUTO_LENGTH_HPP
diff --git a/test/_include/auto/make.hpp b/test/_include/auto/make.hpp
new file mode 100644
index 000000000..83536edfd
--- /dev/null
+++ b/test/_include/auto/make.hpp
@@ -0,0 +1,41 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_HANA_TEST_AUTO_MAKE_HPP
+#define BOOST_HANA_TEST_AUTO_MAKE_HPP
+
+#include <boost/hana/assert.hpp>
+#include <boost/hana/core/make.hpp>
+#include <boost/hana/equal.hpp>
+
+#include "test_case.hpp"
+#include <laws/base.hpp>
+
+
+TestCase test_make{[]{
+    namespace hana = boost::hana;
+    using hana::test::ct_eq;
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        MAKE_TUPLE(),
+        hana::make<TUPLE_TAG>()
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        MAKE_TUPLE(ct_eq<0>{}),
+        hana::make<TUPLE_TAG>(ct_eq<0>{})
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}),
+        hana::make<TUPLE_TAG>(ct_eq<0>{}, ct_eq<1>{})
+    ));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::equal(
+        MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}),
+        hana::make<TUPLE_TAG>(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})
+    ));
+}};
+
+#endif // !BOOST_HANA_TEST_AUTO_MAKE_HPP
diff --git a/test/_include/auto/sequence.hpp b/test/_include/auto/sequence.hpp
new file mode 100644
index 000000000..280b7355b
--- /dev/null
+++ b/test/_include/auto/sequence.hpp
@@ -0,0 +1,13 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_HANA_TEST_AUTO_SEQUENCE_HPP
+#define BOOST_HANA_TEST_AUTO_SEQUENCE_HPP
+
+#include <boost/hana/concept/sequence.hpp>
+
+
+static_assert(boost::hana::Sequence<TUPLE_TAG>::value, "");
+
+#endif // !BOOST_HANA_TEST_AUTO_SEQUENCE_HPP
diff --git a/test/basic_tuple/auto/length.cpp b/test/basic_tuple/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/basic_tuple/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/basic_tuple/auto/make.cpp b/test/basic_tuple/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/basic_tuple/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/basic_tuple/auto/sequence.cpp b/test/basic_tuple/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/basic_tuple/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/deque.cpp b/test/ext/boost/fusion/deque.cpp
deleted file mode 100644
index 80ddb97c9..000000000
--- a/test/ext/boost/fusion/deque.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright Louis Dionne 2013-2017
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#include <boost/hana/ext/boost/fusion/deque.hpp>
-
-#include <boost/fusion/container/generation/make_deque.hpp>
-#include <boost/fusion/container/deque.hpp>
-
-#define MAKE_TUPLE(...) ::boost::fusion::make_deque(__VA_ARGS__)
-#define TUPLE_TYPE(...) ::boost::fusion::deque<__VA_ARGS__>
-#define TUPLE_TAG ::boost::hana::ext::boost::fusion::deque_tag
-
-#include "tests.hpp"
diff --git a/test/ext/boost/fusion/deque/auto/length.cpp b/test/ext/boost/fusion/deque/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/ext/boost/fusion/deque/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/deque/auto/make.cpp b/test/ext/boost/fusion/deque/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/ext/boost/fusion/deque/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/deque/auto/sequence.cpp b/test/ext/boost/fusion/deque/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/ext/boost/fusion/deque/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/list.cpp b/test/ext/boost/fusion/list.cpp
deleted file mode 100644
index 22e0147eb..000000000
--- a/test/ext/boost/fusion/list.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright Louis Dionne 2013-2017
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#include <boost/hana/ext/boost/fusion/list.hpp>
-
-#include <boost/fusion/container/generation/make_list.hpp>
-#include <boost/fusion/container/list.hpp>
-
-#define MAKE_TUPLE(...) ::boost::fusion::make_list(__VA_ARGS__)
-#define TUPLE_TYPE(...) ::boost::fusion::list<__VA_ARGS__>
-#define TUPLE_TAG ::boost::hana::ext::boost::fusion::list_tag
-
-#include "tests.hpp"
diff --git a/test/ext/boost/fusion/list/auto/length.cpp b/test/ext/boost/fusion/list/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/ext/boost/fusion/list/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/list/auto/make.cpp b/test/ext/boost/fusion/list/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/ext/boost/fusion/list/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/list/auto/sequence.cpp b/test/ext/boost/fusion/list/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/ext/boost/fusion/list/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/tests.hpp b/test/ext/boost/fusion/tests.hpp
deleted file mode 100644
index c56786ef8..000000000
--- a/test/ext/boost/fusion/tests.hpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright Louis Dionne 2013-2017
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_HANA_TEST_EXT_BOOST_FUSION_TESTS_HPP
-#define BOOST_HANA_TEST_EXT_BOOST_FUSION_TESTS_HPP
-
-#include <boost/hana/assert.hpp>
-#include <boost/hana/at.hpp>
-#include <boost/hana/concept/sequence.hpp>
-#include <boost/hana/core/make.hpp>
-#include <boost/hana/drop_front.hpp>
-#include <boost/hana/equal.hpp>
-#include <boost/hana/integral_constant.hpp>
-#include <boost/hana/is_empty.hpp>
-#include <boost/hana/length.hpp>
-#include <boost/hana/not.hpp>
-
-#include <laws/base.hpp>
-namespace hana = boost::hana;
-using hana::test::ct_eq;
-
-
-//
-// Before including this header, define the following macros:
-//
-//  MAKE_TUPLE(...)
-//      Must expand to a sequence holding __VA_ARGS__. A valid definition
-//      would be hana::make_tuple(__VA_ARGS__).
-//
-//  TUPLE_TYPE(...)
-//      Must expand to the type of a sequence holding objects of type __VA_ARGS__.
-//      A valid definition would be hana::tuple<__VA_ARGS__>.
-//
-//  TUPLE_TAG
-//      Must expand to the tag of the sequence. A valid definition would
-//      be hana::tuple_tag.
-//
-
-
-struct undefined { };
-
-int main() {
-    //////////////////////////////////////////////////////////////////////////
-    // make<...>
-    //////////////////////////////////////////////////////////////////////////
-    {
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            MAKE_TUPLE(),
-            hana::make<TUPLE_TAG>()
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            MAKE_TUPLE(ct_eq<0>{}),
-            hana::make<TUPLE_TAG>(ct_eq<0>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}),
-            hana::make<TUPLE_TAG>(ct_eq<0>{}, ct_eq<1>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}),
-            hana::make<TUPLE_TAG>(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})
-        ));
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // drop_front
-    //////////////////////////////////////////////////////////////////////////
-    {
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{})),
-            MAKE_TUPLE()
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{})),
-            MAKE_TUPLE(ct_eq<1>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})),
-            MAKE_TUPLE(ct_eq<1>{}, ct_eq<2>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{})),
-            MAKE_TUPLE(ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{})
-        ));
-
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}), hana::size_c<2>),
-            MAKE_TUPLE(ct_eq<2>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{}), hana::size_c<2>),
-            MAKE_TUPLE(ct_eq<2>{}, ct_eq<3>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{}), hana::size_c<3>),
-            MAKE_TUPLE(ct_eq<3>{})
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::drop_front(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{}, ct_eq<3>{}), hana::size_c<5>),
-            MAKE_TUPLE()
-        ));
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // at
-    //////////////////////////////////////////////////////////////////////////
-    {
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::at_c<0>(MAKE_TUPLE(ct_eq<0>{})),
-            ct_eq<0>{}
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::at_c<0>(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{})),
-            ct_eq<0>{}
-        ));
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::at_c<1>(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{})),
-            ct_eq<1>{}
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::at_c<0>(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})),
-            ct_eq<0>{}
-        ));
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::at_c<1>(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})),
-            ct_eq<1>{}
-        ));
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::at_c<2>(MAKE_TUPLE(ct_eq<0>{}, ct_eq<1>{}, ct_eq<2>{})),
-            ct_eq<2>{}
-        ));
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // is_empty
-    //////////////////////////////////////////////////////////////////////////
-    {
-        BOOST_HANA_CONSTANT_CHECK(hana::is_empty(
-            MAKE_TUPLE()
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::not_(hana::is_empty(
-            MAKE_TUPLE(undefined{})
-        )));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::not_(hana::is_empty(
-            MAKE_TUPLE(undefined{}, undefined{})
-        )));
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // length
-    //////////////////////////////////////////////////////////////////////////
-    {
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::length(MAKE_TUPLE()),
-            hana::size_c<0>
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::length(MAKE_TUPLE(undefined{})),
-            hana::size_c<1>
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::length(MAKE_TUPLE(undefined{}, undefined{})),
-            hana::size_c<2>
-        ));
-
-        BOOST_HANA_CONSTANT_CHECK(hana::equal(
-            hana::length(MAKE_TUPLE(undefined{}, undefined{}, undefined{})),
-            hana::size_c<3>
-        ));
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Sequence
-    //////////////////////////////////////////////////////////////////////////
-    {
-        static_assert(hana::Sequence<TUPLE_TAG>::value, "");
-    }
-}
-
-#endif // !BOOST_HANA_TEST_EXT_BOOST_FUSION_TESTS_HPP
diff --git a/test/ext/boost/fusion/tuple.cpp b/test/ext/boost/fusion/tuple.cpp
deleted file mode 100644
index 4ae1b6b54..000000000
--- a/test/ext/boost/fusion/tuple.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright Louis Dionne 2013-2017
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#include <boost/hana/ext/boost/fusion/tuple.hpp>
-
-#include <boost/fusion/tuple.hpp>
-
-#define MAKE_TUPLE(...) ::boost::fusion::make_tuple(__VA_ARGS__)
-#define TUPLE_TYPE(...) ::boost::fusion::tuple<__VA_ARGS__>
-#define TUPLE_TAG ::boost::hana::ext::boost::fusion::tuple_tag
-
-#include "tests.hpp"
diff --git a/test/ext/boost/fusion/tuple/auto/length.cpp b/test/ext/boost/fusion/tuple/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/ext/boost/fusion/tuple/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/tuple/auto/make.cpp b/test/ext/boost/fusion/tuple/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/ext/boost/fusion/tuple/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/tuple/auto/sequence.cpp b/test/ext/boost/fusion/tuple/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/ext/boost/fusion/tuple/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/vector.cpp b/test/ext/boost/fusion/vector.cpp
deleted file mode 100644
index 09d6373ce..000000000
--- a/test/ext/boost/fusion/vector.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright Louis Dionne 2013-2017
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#include <boost/hana/ext/boost/fusion/vector.hpp>
-
-#include <boost/fusion/container/generation/make_vector.hpp>
-#include <boost/fusion/container/vector.hpp>
-
-#define MAKE_TUPLE(...) ::boost::fusion::make_vector(__VA_ARGS__)
-#define TUPLE_TYPE(...) ::boost::fusion::vector<__VA_ARGS__>
-#define TUPLE_TAG ::boost::hana::ext::boost::fusion::vector_tag
-
-#include "tests.hpp"
diff --git a/test/ext/boost/fusion/vector/auto/length.cpp b/test/ext/boost/fusion/vector/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/ext/boost/fusion/vector/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/vector/auto/make.cpp b/test/ext/boost/fusion/vector/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/ext/boost/fusion/vector/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/ext/boost/fusion/vector/auto/sequence.cpp b/test/ext/boost/fusion/vector/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/ext/boost/fusion/vector/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/ext/boost/tuple/auto/length.cpp b/test/ext/boost/tuple/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/ext/boost/tuple/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/ext/boost/tuple/auto/make.cpp b/test/ext/boost/tuple/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/ext/boost/tuple/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/ext/boost/tuple/auto/sequence.cpp b/test/ext/boost/tuple/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/ext/boost/tuple/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/ext/std/tuple/auto/length.cpp b/test/ext/std/tuple/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/ext/std/tuple/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/ext/std/tuple/auto/make.cpp b/test/ext/std/tuple/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/ext/std/tuple/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/ext/std/tuple/auto/sequence.cpp b/test/ext/std/tuple/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/ext/std/tuple/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }
diff --git a/test/tuple/auto/length.cpp b/test/tuple/auto/length.cpp
new file mode 100644
index 000000000..55111dd60
--- /dev/null
+++ b/test/tuple/auto/length.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/length.hpp>
+
+int main() { }
diff --git a/test/tuple/auto/make.cpp b/test/tuple/auto/make.cpp
new file mode 100644
index 000000000..f90514f16
--- /dev/null
+++ b/test/tuple/auto/make.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/make.hpp>
+
+int main() { }
diff --git a/test/tuple/auto/sequence.cpp b/test/tuple/auto/sequence.cpp
new file mode 100644
index 000000000..4ed01e852
--- /dev/null
+++ b/test/tuple/auto/sequence.cpp
@@ -0,0 +1,8 @@
+// Copyright Louis Dionne 2013-2017
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+#include "_specs.hpp"
+#include <auto/sequence.hpp>
+
+int main() { }