diff --git a/test/thread/futures/futures.async/async.pass.cpp b/test/thread/futures/futures.async/async.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.async/async.pass.cpp
rename to test/thread/futures/futures.async/async.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/alloc_ctor.pass.cpp b/test/thread/futures/futures.promise/alloc_ctor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/alloc_ctor.pass.cpp
rename to test/thread/futures/futures.promise/alloc_ctor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/default.pass.cpp b/test/thread/futures/futures.promise/default.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/default.pass.cpp
rename to test/thread/futures/futures.promise/default.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/dtor.pass.cpp b/test/thread/futures/futures.promise/dtor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/dtor.pass.cpp
rename to test/thread/futures/futures.promise/dtor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/get_future.pass.cpp b/test/thread/futures/futures.promise/get_future.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/get_future.pass.cpp
rename to test/thread/futures/futures.promise/get_future.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/move_assign.pass.cpp b/test/thread/futures/futures.promise/move_assign.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/move_assign.pass.cpp
rename to test/thread/futures/futures.promise/move_assign.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/move_ctor.pass.cpp b/test/thread/futures/futures.promise/move_ctor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/move_ctor.pass.cpp
rename to test/thread/futures/futures.promise/move_ctor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_exception.pass.cpp b/test/thread/futures/futures.promise/set_exception.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_exception.pass.cpp
rename to test/thread/futures/futures.promise/set_exception.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp b/test/thread/futures/futures.promise/set_exception_at_thread_exit.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
rename to test/thread/futures/futures.promise/set_exception_at_thread_exit.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_lvalue.pass.cpp b/test/thread/futures/futures.promise/set_lvalue.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_lvalue.pass.cpp
rename to test/thread/futures/futures.promise/set_lvalue.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_lvalue_at_thread_exit.pass.cpp b/test/thread/futures/futures.promise/set_lvalue_at_thread_exit.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_lvalue_at_thread_exit.pass.cpp
rename to test/thread/futures/futures.promise/set_lvalue_at_thread_exit.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_rvalue.pass.cpp b/test/thread/futures/futures.promise/set_rvalue.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_rvalue.pass.cpp
rename to test/thread/futures/futures.promise/set_rvalue.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp b/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
rename to test/thread/futures/futures.promise/set_rvalue_at_thread_exit.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_value_at_thread_exit_const.pass.cpp b/test/thread/futures/futures.promise/set_value_at_thread_exit_const.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_value_at_thread_exit_const.pass.cpp
rename to test/thread/futures/futures.promise/set_value_at_thread_exit_const.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_value_at_thread_exit_void.pass.cpp b/test/thread/futures/futures.promise/set_value_at_thread_exit_void.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_value_at_thread_exit_void.pass.cpp
rename to test/thread/futures/futures.promise/set_value_at_thread_exit_void.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_value_const.pass.cpp b/test/thread/futures/futures.promise/set_value_const.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_value_const.pass.cpp
rename to test/thread/futures/futures.promise/set_value_const.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/set_value_void.pass.cpp b/test/thread/futures/futures.promise/set_value_void.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/set_value_void.pass.cpp
rename to test/thread/futures/futures.promise/set_value_void.xfail.pass.cpp
diff --git a/test/thread/futures/futures.promise/swap.pass.cpp b/test/thread/futures/futures.promise/swap.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.promise/swap.pass.cpp
rename to test/thread/futures/futures.promise/swap.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/copy_assign.pass.cpp b/test/thread/futures/futures.shared_future/copy_assign.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/copy_assign.pass.cpp
rename to test/thread/futures/futures.shared_future/copy_assign.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/copy_ctor.pass.cpp b/test/thread/futures/futures.shared_future/copy_ctor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/copy_ctor.pass.cpp
rename to test/thread/futures/futures.shared_future/copy_ctor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/ctor_future.pass.cpp b/test/thread/futures/futures.shared_future/ctor_future.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/ctor_future.pass.cpp
rename to test/thread/futures/futures.shared_future/ctor_future.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/dtor.pass.cpp b/test/thread/futures/futures.shared_future/dtor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/dtor.pass.cpp
rename to test/thread/futures/futures.shared_future/dtor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/get.pass.cpp b/test/thread/futures/futures.shared_future/get.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/get.pass.cpp
rename to test/thread/futures/futures.shared_future/get.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/move_assign.pass.cpp b/test/thread/futures/futures.shared_future/move_assign.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/move_assign.pass.cpp
rename to test/thread/futures/futures.shared_future/move_assign.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/move_ctor.pass.cpp b/test/thread/futures/futures.shared_future/move_ctor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/move_ctor.pass.cpp
rename to test/thread/futures/futures.shared_future/move_ctor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/wait.pass.cpp b/test/thread/futures/futures.shared_future/wait.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/wait.pass.cpp
rename to test/thread/futures/futures.shared_future/wait.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/wait_for.pass.cpp b/test/thread/futures/futures.shared_future/wait_for.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/wait_for.pass.cpp
rename to test/thread/futures/futures.shared_future/wait_for.xfail.pass.cpp
diff --git a/test/thread/futures/futures.shared_future/wait_until.pass.cpp b/test/thread/futures/futures.shared_future/wait_until.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.shared_future/wait_until.pass.cpp
rename to test/thread/futures/futures.shared_future/wait_until.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/assign_move.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/assign_move.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/ctor_func.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/ctor_func.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/ctor_move.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/ctor_move.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/dtor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/dtor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/get_future.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/get_future.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/operator.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/operator.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/operator.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/operator.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/reset.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/reset.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/reset.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/reset.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp b/test/thread/futures/futures.tas/futures.task.members/swap.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.members/swap.xfail.pass.cpp
diff --git a/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp b/test/thread/futures/futures.tas/futures.task.nonmembers/swap.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp
rename to test/thread/futures/futures.tas/futures.task.nonmembers/swap.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/dtor.pass.cpp b/test/thread/futures/futures.unique_future/dtor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/dtor.pass.cpp
rename to test/thread/futures/futures.unique_future/dtor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/get.pass.cpp b/test/thread/futures/futures.unique_future/get.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/get.pass.cpp
rename to test/thread/futures/futures.unique_future/get.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/move_assign.pass.cpp b/test/thread/futures/futures.unique_future/move_assign.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/move_assign.pass.cpp
rename to test/thread/futures/futures.unique_future/move_assign.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/move_ctor.pass.cpp b/test/thread/futures/futures.unique_future/move_ctor.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/move_ctor.pass.cpp
rename to test/thread/futures/futures.unique_future/move_ctor.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/share.pass.cpp b/test/thread/futures/futures.unique_future/share.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/share.pass.cpp
rename to test/thread/futures/futures.unique_future/share.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/wait.pass.cpp b/test/thread/futures/futures.unique_future/wait.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/wait.pass.cpp
rename to test/thread/futures/futures.unique_future/wait.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/wait_for.pass.cpp b/test/thread/futures/futures.unique_future/wait_for.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/wait_for.pass.cpp
rename to test/thread/futures/futures.unique_future/wait_for.xfail.pass.cpp
diff --git a/test/thread/futures/futures.unique_future/wait_until.pass.cpp b/test/thread/futures/futures.unique_future/wait_until.xfail.pass.cpp
similarity index 100%
rename from test/thread/futures/futures.unique_future/wait_until.pass.cpp
rename to test/thread/futures/futures.unique_future/wait_until.xfail.pass.cpp
diff --git a/test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp b/test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.xfail.pass.cpp
similarity index 100%
rename from test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
rename to test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.xfail.pass.cpp