diff --git a/include/future b/include/future
index 3bbb92586..936060e17 100644
--- a/include/future
+++ b/include/future
@@ -322,7 +322,7 @@ template <class R, class... ArgTypes>
 class packaged_task<R(ArgTypes...)>
 {
 public:
-    typedef R result_type;
+    typedef R result_type; // extension
 
     // construction and destruction
     packaged_task() noexcept;
@@ -1998,7 +1998,7 @@ template<class _Rp, class ..._ArgTypes>
 class _LIBCPP_TYPE_VIS_ONLY packaged_task<_Rp(_ArgTypes...)>
 {
 public:
-    typedef _Rp result_type;
+    typedef _Rp result_type; // extension
 
 private:
     __packaged_task_function<result_type(_ArgTypes...)> __f_;
@@ -2127,7 +2127,7 @@ template<class ..._ArgTypes>
 class _LIBCPP_TYPE_VIS_ONLY packaged_task<void(_ArgTypes...)>
 {
 public:
-    typedef void result_type;
+    typedef void result_type; // extension
 
 private:
     __packaged_task_function<result_type(_ArgTypes...)> __f_;
diff --git a/test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp b/test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp
similarity index 100%
rename from test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp
rename to test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/types.pass.cpp b/test/libcxx/thread/futures/futures.task/types.pass.cpp
similarity index 90%
rename from test/std/thread/futures/futures.tas/types.pass.cpp
rename to test/libcxx/thread/futures/futures.task/types.pass.cpp
index f7c9b223a..cb0fb803c 100644
--- a/test/std/thread/futures/futures.tas/types.pass.cpp
+++ b/test/libcxx/thread/futures/futures.task/types.pass.cpp
@@ -16,7 +16,9 @@
 //     class packaged_task<R(ArgTypes...)>
 // {
 // public:
-//     typedef R result_type;
+//     typedef R result_type; // extension
+
+// This is a libc++ extension.
 
 #include <future>
 #include <type_traits>
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp b/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp
similarity index 99%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp
index 5d53119b3..6d7d734bd 100644
--- a/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp
+++ b/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp
@@ -15,7 +15,7 @@
 // class packaged_task<R(ArgTypes...)>
 // template <class F>
 //   packaged_task(F&& f);
-// These constructors shall not participate in overload resolution if 
+// These constructors shall not participate in overload resolution if
 //    decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>.
 
 #include <future>
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp
similarity index 99%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp
index bedff389b..984dcdc80 100644
--- a/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp
+++ b/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp
@@ -15,7 +15,7 @@
 // class packaged_task<R(ArgTypes...)>
 // template <class F, class Allocator>
 //   packaged_task(allocator_arg_t, const Allocator& a, F&& f);
-// These constructors shall not participate in overload resolution if 
+// These constructors shall not participate in overload resolution if
 //    decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>.
 
 #include <future>
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp b/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp b/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
diff --git a/test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp b/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
similarity index 100%
rename from test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp
rename to test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp