From c3deeb5f89f0fa733e4e2c4d260d6f816d6b1b5e Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Tue, 3 Dec 2013 00:18:10 +0000
Subject: [PATCH] Found six (nmostly) identical files named 'test_allocator.h'
 in the libcxx test suite. Moved one to /support, made it a superset, and
 removed all but one of the others, and iupdated all the includes. Left the
 odd one (thread/futures/test_allocator.h) for later.

llvm-svn: 196174
---
 .../associative/map/map.cons/alloc.pass.cpp   |   2 +-
 .../map/map.cons/compare_alloc.pass.cpp       |   2 +-
 .../associative/map/map.cons/copy.pass.cpp    |   2 +-
 .../map/map.cons/copy_alloc.pass.cpp          |   2 +-
 .../map/map.cons/copy_assign.pass.cpp         |   2 +-
 .../map/map.cons/default_noexcept.pass.cpp    |   2 +-
 .../map/map.cons/dtor_noexcept.pass.cpp       |   2 +-
 .../initializer_list_compare_alloc.pass.cpp   |   2 +-
 .../map.cons/iter_iter_comp_alloc.pass.cpp    |   2 +-
 .../associative/map/map.cons/move.pass.cpp    |   2 +-
 .../map/map.cons/move_alloc.pass.cpp          |   2 +-
 .../map/map.cons/move_assign.pass.cpp         |   2 +-
 .../map.cons/move_assign_noexcept.pass.cpp    |   2 +-
 .../map/map.cons/move_noexcept.pass.cpp       |   2 +-
 .../map/map.special/non_member_swap.pass.cpp  |   2 +-
 .../map/map.special/swap_noexcept.pass.cpp    |   2 +-
 .../multimap/multimap.cons/alloc.pass.cpp     |   2 +-
 .../multimap.cons/compare_alloc.pass.cpp      |   2 +-
 .../multimap/multimap.cons/copy.pass.cpp      |   2 +-
 .../multimap.cons/copy_alloc.pass.cpp         |   2 +-
 .../multimap.cons/copy_assign.pass.cpp        |   2 +-
 .../multimap.cons/default_noexcept.pass.cpp   |   2 +-
 .../multimap.cons/dtor_noexcept.pass.cpp      |   2 +-
 .../initializer_list_compare_alloc.pass.cpp   |   2 +-
 .../iter_iter_comp_alloc.pass.cpp             |   2 +-
 .../multimap/multimap.cons/move.pass.cpp      |   2 +-
 .../multimap.cons/move_alloc.pass.cpp         |   2 +-
 .../multimap.cons/move_assign.pass.cpp        |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../multimap.cons/move_noexcept.pass.cpp      |   2 +-
 .../multimap.special/non_member_swap.pass.cpp |   2 +-
 .../multimap.special/swap_noexcept.pass.cpp   |   2 +-
 .../multiset/multiset.cons/alloc.pass.cpp     |   2 +-
 .../multiset.cons/compare_alloc.pass.cpp      |   2 +-
 .../multiset/multiset.cons/copy.pass.cpp      |   2 +-
 .../multiset.cons/copy_alloc.pass.cpp         |   2 +-
 .../multiset.cons/copy_assign.pass.cpp        |   2 +-
 .../multiset.cons/default_noexcept.pass.cpp   |   2 +-
 .../multiset.cons/dtor_noexcept.pass.cpp      |   2 +-
 .../initializer_list_compare_alloc.pass.cpp   |   2 +-
 .../multiset.cons/iter_iter_alloc.pass.cpp    |   2 +-
 .../multiset/multiset.cons/move.pass.cpp      |   2 +-
 .../multiset.cons/move_alloc.pass.cpp         |   2 +-
 .../multiset.cons/move_assign.pass.cpp        |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../multiset.cons/move_noexcept.pass.cpp      |   2 +-
 .../multiset.special/non_member_swap.pass.cpp |   2 +-
 .../multiset.special/swap_noexcept.pass.cpp   |   2 +-
 .../associative/set/set.cons/alloc.pass.cpp   |   2 +-
 .../set/set.cons/compare_alloc.pass.cpp       |   2 +-
 .../associative/set/set.cons/copy.pass.cpp    |   2 +-
 .../set/set.cons/copy_alloc.pass.cpp          |   2 +-
 .../set/set.cons/copy_assign.pass.cpp         |   2 +-
 .../set/set.cons/default_noexcept.pass.cpp    |   2 +-
 .../set/set.cons/dtor_noexcept.pass.cpp       |   2 +-
 .../initializer_list_compare_alloc.pass.cpp   |   2 +-
 .../set/set.cons/iter_iter_alloc.pass.cpp     |   2 +-
 .../associative/set/set.cons/move.pass.cpp    |   2 +-
 .../set/set.cons/move_alloc.pass.cpp          |   2 +-
 .../set/set.cons/move_assign.pass.cpp         |   2 +-
 .../set.cons/move_assign_noexcept.pass.cpp    |   2 +-
 .../set/set.cons/move_noexcept.pass.cpp       |   2 +-
 .../set/set.special/non_member_swap.pass.cpp  |   2 +-
 .../set/set.special/swap_noexcept.pass.cpp    |   2 +-
 .../priqueue.cons.alloc/ctor_alloc.pass.cpp   |   2 +-
 .../ctor_comp_alloc.pass.cpp                  |   2 +-
 .../ctor_comp_cont_alloc.pass.cpp             |   2 +-
 .../ctor_comp_rcont_alloc.pass.cpp            |   2 +-
 .../ctor_copy_alloc.pass.cpp                  |   2 +-
 .../ctor_move_alloc.pass.cpp                  |   2 +-
 .../queue.cons.alloc/ctor_alloc.pass.cpp      |   2 +-
 .../ctor_container_alloc.pass.cpp             |   2 +-
 .../ctor_queue_alloc.pass.cpp                 |   2 +-
 .../ctor_rcontainer_alloc.pass.cpp            |   2 +-
 .../ctor_rqueue_alloc.pass.cpp                |   2 +-
 .../stack.cons.alloc/ctor_alloc.pass.cpp      |   2 +-
 .../ctor_container_alloc.pass.cpp             |   2 +-
 .../stack.cons.alloc/ctor_copy_alloc.pass.cpp |   2 +-
 .../ctor_rcontainer_alloc.pass.cpp            |   2 +-
 .../ctor_rqueue_alloc.pass.cpp                |   2 +-
 .../sequences/deque/deque.cons/alloc.pass.cpp |   2 +-
 .../sequences/deque/deque.cons/copy.pass.cpp  |   2 +-
 .../deque/deque.cons/copy_alloc.pass.cpp      |   2 +-
 .../deque.cons/default_noexcept.pass.cpp      |   2 +-
 .../deque/deque.cons/dtor_noexcept.pass.cpp   |   2 +-
 .../initializer_list_alloc.pass.cpp           |   2 +-
 .../deque/deque.cons/iter_iter_alloc.pass.cpp |   2 +-
 .../sequences/deque/deque.cons/move.pass.cpp  |   2 +-
 .../deque/deque.cons/move_alloc.pass.cpp      |   2 +-
 .../deque/deque.cons/move_assign.pass.cpp     |   2 +-
 .../deque.cons/move_assign_noexcept.pass.cpp  |   2 +-
 .../deque/deque.cons/move_noexcept.pass.cpp   |   2 +-
 .../deque/deque.cons/op_equal.pass.cpp        |   2 +-
 .../deque/deque.special/swap.pass.cpp         |   2 +-
 .../deque.special/swap_noexcept.pass.cpp      |   2 +-
 .../containers/sequences/deque/types.pass.cpp |   2 +-
 .../dynarray/dynarray.cons/alloc.pass.cpp     |   2 +-
 .../dynarray/dynarray.traits/default.pass.cpp |   2 +-
 .../forwardlist.cons/alloc.fail.cpp           |   2 +-
 .../forwardlist.cons/alloc.pass.cpp           |   2 +-
 .../forwardlist.cons/assign_copy.pass.cpp     |   2 +-
 .../forwardlist.cons/assign_move.pass.cpp     |   2 +-
 .../forwardlist.cons/copy.pass.cpp            |   2 +-
 .../forwardlist.cons/copy_alloc.pass.cpp      |   2 +-
 .../default_noexcept.pass.cpp                 |   2 +-
 .../forwardlist.cons/dtor_noexcept.pass.cpp   |   2 +-
 .../forwardlist.cons/init_alloc.pass.cpp      |   2 +-
 .../forwardlist.cons/move.pass.cpp            |   2 +-
 .../forwardlist.cons/move_alloc.pass.cpp      |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../forwardlist.cons/move_noexcept.pass.cpp   |   2 +-
 .../forwardlist.cons/range_alloc.pass.cpp     |   2 +-
 .../size_value_alloc.pass.cpp                 |   2 +-
 .../forwardlist.spec/member_swap.pass.cpp     |   2 +-
 .../forwardlist.spec/non_member_swap.pass.cpp |   2 +-
 .../forwardlist.spec/swap_noexcept.pass.cpp   |   2 +-
 .../list/list.cons/assign_copy.pass.cpp       |   2 +-
 .../list/list.cons/assign_move.pass.cpp       |   2 +-
 .../sequences/list/list.cons/copy.pass.cpp    |   2 +-
 .../list/list.cons/copy_alloc.pass.cpp        |   2 +-
 .../list/list.cons/default_noexcept.pass.cpp  |   2 +-
 .../list/list.cons/dtor_noexcept.pass.cpp     |   2 +-
 .../list.cons/initializer_list_alloc.pass.cpp |   2 +-
 .../sequences/list/list.cons/move.pass.cpp    |   2 +-
 .../list/list.cons/move_alloc.pass.cpp        |   2 +-
 .../list.cons/move_assign_noexcept.pass.cpp   |   2 +-
 .../list/list.cons/move_noexcept.pass.cpp     |   2 +-
 .../sequences/list/list.special/swap.pass.cpp |   2 +-
 .../list/list.special/swap_noexcept.pass.cpp  |   2 +-
 .../vector.bool/assign_copy.pass.cpp          |   2 +-
 .../vector.bool/assign_move.pass.cpp          |   2 +-
 .../vector.bool/construct_default.pass.cpp    |   2 +-
 .../vector.bool/construct_size.pass.cpp       |   2 +-
 .../sequences/vector.bool/copy.pass.cpp       |   2 +-
 .../sequences/vector.bool/copy_alloc.pass.cpp |   2 +-
 .../vector.bool/default_noexcept.pass.cpp     |   2 +-
 .../vector.bool/dtor_noexcept.pass.cpp        |   2 +-
 .../initializer_list_alloc.pass.cpp           |   2 +-
 .../sequences/vector.bool/move.pass.cpp       |   2 +-
 .../sequences/vector.bool/move_alloc.pass.cpp |   2 +-
 .../vector.bool/move_assign_noexcept.pass.cpp |   2 +-
 .../vector.bool/move_noexcept.pass.cpp        |   2 +-
 .../sequences/vector.bool/swap.pass.cpp       |   2 +-
 .../vector.bool/swap_noexcept.pass.cpp        |   2 +-
 .../sequences/vector.bool/types.pass.cpp      |   2 +-
 .../sequences/vector/types.pass.cpp           |   2 +-
 .../vector/vector.cons/assign_copy.pass.cpp   |   2 +-
 .../vector/vector.cons/assign_move.pass.cpp   |   2 +-
 .../vector.cons/construct_default.pass.cpp    |   2 +-
 .../vector.cons/construct_size.pass.cpp       |   2 +-
 .../vector/vector.cons/copy.pass.cpp          |   2 +-
 .../vector/vector.cons/copy_alloc.pass.cpp    |   2 +-
 .../vector.cons/default_noexcept.pass.cpp     |   2 +-
 .../vector/vector.cons/dtor_noexcept.pass.cpp |   2 +-
 .../initializer_list_alloc.pass.cpp           |   2 +-
 .../vector/vector.cons/move.pass.cpp          |   2 +-
 .../vector/vector.cons/move_alloc.pass.cpp    |   2 +-
 .../vector.cons/move_assign_noexcept.pass.cpp |   2 +-
 .../vector/vector.cons/move_noexcept.pass.cpp |   2 +-
 .../vector/vector.special/swap.pass.cpp       |   2 +-
 .../vector.special/swap_noexcept.pass.cpp     |   2 +-
 .../unord/unord.map/swap_member.pass.cpp      |   2 +-
 .../unord.map.cnstr/allocator.pass.cpp        |   2 +-
 .../unord.map.cnstr/assign_copy.pass.cpp      |   2 +-
 .../unord.map.cnstr/assign_move.pass.cpp      |   2 +-
 .../unord.map/unord.map.cnstr/copy.pass.cpp   |   2 +-
 .../unord.map.cnstr/copy_alloc.pass.cpp       |   2 +-
 .../unord.map.cnstr/default.pass.cpp          |   2 +-
 .../unord.map.cnstr/default_noexcept.pass.cpp |   2 +-
 .../unord.map.cnstr/dtor_noexcept.pass.cpp    |   2 +-
 .../unord.map/unord.map.cnstr/init.pass.cpp   |   2 +-
 .../unord.map.cnstr/init_size.pass.cpp        |   2 +-
 .../unord.map.cnstr/init_size_hash.pass.cpp   |   2 +-
 .../init_size_hash_equal.pass.cpp             |   2 +-
 .../init_size_hash_equal_allocator.pass.cpp   |   2 +-
 .../unord.map/unord.map.cnstr/move.pass.cpp   |   2 +-
 .../unord.map.cnstr/move_alloc.pass.cpp       |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../unord.map.cnstr/move_noexcept.pass.cpp    |   2 +-
 .../unord.map/unord.map.cnstr/range.pass.cpp  |   2 +-
 .../unord.map.cnstr/range_size.pass.cpp       |   2 +-
 .../unord.map.cnstr/range_size_hash.pass.cpp  |   2 +-
 .../range_size_hash_equal.pass.cpp            |   2 +-
 .../range_size_hash_equal_allocator.pass.cpp  |   2 +-
 .../unord.map/unord.map.cnstr/size.fail.cpp   |   2 +-
 .../unord.map/unord.map.cnstr/size.pass.cpp   |   2 +-
 .../unord.map.cnstr/size_hash.pass.cpp        |   2 +-
 .../unord.map.cnstr/size_hash_equal.pass.cpp  |   2 +-
 .../size_hash_equal_allocator.pass.cpp        |   2 +-
 .../unord.map.swap/swap_noexcept.pass.cpp     |   2 +-
 .../unord.map.swap/swap_non_member.pass.cpp   |   2 +-
 .../unord/unord.multimap/swap_member.pass.cpp |   2 +-
 .../unord.multimap.cnstr/allocator.pass.cpp   |   2 +-
 .../unord.multimap.cnstr/assign_copy.pass.cpp |   2 +-
 .../unord.multimap.cnstr/assign_init.pass.cpp |   2 +-
 .../unord.multimap.cnstr/assign_move.pass.cpp |   2 +-
 .../unord.multimap.cnstr/copy.pass.cpp        |   2 +-
 .../unord.multimap.cnstr/copy_alloc.pass.cpp  |   2 +-
 .../unord.multimap.cnstr/default.pass.cpp     |   2 +-
 .../default_noexcept.pass.cpp                 |   2 +-
 .../dtor_noexcept.pass.cpp                    |   2 +-
 .../unord.multimap.cnstr/init.pass.cpp        |   2 +-
 .../unord.multimap.cnstr/init_size.pass.cpp   |   2 +-
 .../init_size_hash.pass.cpp                   |   2 +-
 .../init_size_hash_equal.pass.cpp             |   2 +-
 .../init_size_hash_equal_allocator.pass.cpp   |   2 +-
 .../unord.multimap.cnstr/move.pass.cpp        |   2 +-
 .../unord.multimap.cnstr/move_alloc.pass.cpp  |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../move_noexcept.pass.cpp                    |   2 +-
 .../unord.multimap.cnstr/range.pass.cpp       |   2 +-
 .../unord.multimap.cnstr/range_size.pass.cpp  |   2 +-
 .../range_size_hash.pass.cpp                  |   2 +-
 .../range_size_hash_equal.pass.cpp            |   2 +-
 .../range_size_hash_equal_allocator.pass.cpp  |   2 +-
 .../unord.multimap.cnstr/size.fail.cpp        |   2 +-
 .../unord.multimap.cnstr/size.pass.cpp        |   2 +-
 .../unord.multimap.cnstr/size_hash.pass.cpp   |   2 +-
 .../size_hash_equal.pass.cpp                  |   2 +-
 .../size_hash_equal_allocator.pass.cpp        |   2 +-
 .../swap_noexcept.pass.cpp                    |   2 +-
 .../swap_non_member.pass.cpp                  |   2 +-
 .../unord/unord.multiset/swap_member.pass.cpp |   2 +-
 .../unord.multiset.cnstr/allocator.pass.cpp   |   2 +-
 .../unord.multiset.cnstr/assign_copy.pass.cpp |   2 +-
 .../unord.multiset.cnstr/assign_init.pass.cpp |   2 +-
 .../unord.multiset.cnstr/assign_move.pass.cpp |   2 +-
 .../unord.multiset.cnstr/copy.pass.cpp        |   2 +-
 .../unord.multiset.cnstr/copy_alloc.pass.cpp  |   2 +-
 .../unord.multiset.cnstr/default.pass.cpp     |   2 +-
 .../default_noexcept.pass.cpp                 |   2 +-
 .../dtor_noexcept.pass.cpp                    |   2 +-
 .../unord.multiset.cnstr/init.pass.cpp        |   2 +-
 .../unord.multiset.cnstr/init_size.pass.cpp   |   2 +-
 .../init_size_hash.pass.cpp                   |   2 +-
 .../init_size_hash_equal.pass.cpp             |   2 +-
 .../init_size_hash_equal_allocator.pass.cpp   |   2 +-
 .../unord.multiset.cnstr/move.pass.cpp        |   2 +-
 .../unord.multiset.cnstr/move_alloc.pass.cpp  |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../move_noexcept.pass.cpp                    |   2 +-
 .../unord.multiset.cnstr/range.pass.cpp       |   2 +-
 .../unord.multiset.cnstr/range_size.pass.cpp  |   2 +-
 .../range_size_hash.pass.cpp                  |   2 +-
 .../range_size_hash_equal.pass.cpp            |   2 +-
 .../range_size_hash_equal_allocator.pass.cpp  |   2 +-
 .../unord.multiset.cnstr/size.fail.cpp        |   2 +-
 .../unord.multiset.cnstr/size.pass.cpp        |   2 +-
 .../unord.multiset.cnstr/size_hash.pass.cpp   |   2 +-
 .../size_hash_equal.pass.cpp                  |   2 +-
 .../size_hash_equal_allocator.pass.cpp        |   2 +-
 .../swap_noexcept.pass.cpp                    |   2 +-
 .../swap_non_member.pass.cpp                  |   2 +-
 .../unord/unord.set/swap_member.pass.cpp      |   2 +-
 .../unord.set.cnstr/allocator.pass.cpp        |   2 +-
 .../unord.set.cnstr/assign_copy.pass.cpp      |   2 +-
 .../unord.set.cnstr/assign_init.pass.cpp      |   2 +-
 .../unord.set.cnstr/assign_move.pass.cpp      |   2 +-
 .../unord.set/unord.set.cnstr/copy.pass.cpp   |   2 +-
 .../unord.set.cnstr/copy_alloc.pass.cpp       |   2 +-
 .../unord.set.cnstr/default.pass.cpp          |   2 +-
 .../unord.set.cnstr/default_noexcept.pass.cpp |   2 +-
 .../unord.set.cnstr/dtor_noexcept.pass.cpp    |   2 +-
 .../unord.set/unord.set.cnstr/init.pass.cpp   |   2 +-
 .../unord.set.cnstr/init_size.pass.cpp        |   2 +-
 .../unord.set.cnstr/init_size_hash.pass.cpp   |   2 +-
 .../init_size_hash_equal.pass.cpp             |   2 +-
 .../init_size_hash_equal_allocator.pass.cpp   |   2 +-
 .../unord.set/unord.set.cnstr/move.pass.cpp   |   2 +-
 .../unord.set.cnstr/move_alloc.pass.cpp       |   2 +-
 .../move_assign_noexcept.pass.cpp             |   2 +-
 .../unord.set.cnstr/move_noexcept.pass.cpp    |   2 +-
 .../unord.set/unord.set.cnstr/range.pass.cpp  |   2 +-
 .../unord.set.cnstr/range_size.pass.cpp       |   2 +-
 .../unord.set.cnstr/range_size_hash.pass.cpp  |   2 +-
 .../range_size_hash_equal.pass.cpp            |   2 +-
 .../range_size_hash_equal_allocator.pass.cpp  |   2 +-
 .../unord.set/unord.set.cnstr/size.fail.cpp   |   2 +-
 .../unord.set/unord.set.cnstr/size.pass.cpp   |   2 +-
 .../unord.set.cnstr/size_hash.pass.cpp        |   2 +-
 .../unord.set.cnstr/size_hash_equal.pass.cpp  |   2 +-
 .../size_hash_equal_allocator.pass.cpp        |   2 +-
 .../unord.set.swap/swap_noexcept.pass.cpp     |   2 +-
 .../unord.set.swap/swap_non_member.pass.cpp   |   2 +-
 .../re.results.all/get_allocator.pass.cpp     |   2 +-
 .../re.results.const/allocator.pass.cpp       |   2 +-
 .../re.results/re.results.form/form2.pass.cpp |   2 +-
 .../re.results/re.results.form/form3.pass.cpp |   2 +-
 libcxx/test/re/test_allocator.h               | 117 ------------------
 .../string.capacity/capacity.pass.cpp         |   2 +-
 .../basic.string/string.cons/alloc.pass.cpp   |   2 +-
 .../basic.string/string.cons/copy.pass.cpp    |   2 +-
 .../string.cons/copy_alloc.pass.cpp           |   2 +-
 .../string.cons/default_noexcept.pass.cpp     |   2 +-
 .../string.cons/dtor_noexcept.pass.cpp        |   2 +-
 .../string.cons/initializer_list.pass.cpp     |   2 +-
 .../string.cons/iter_alloc.pass.cpp           |   2 +-
 .../basic.string/string.cons/move.pass.cpp    |   2 +-
 .../string.cons/move_alloc.pass.cpp           |   2 +-
 .../string.cons/move_assign_noexcept.pass.cpp |   2 +-
 .../string.cons/move_assignment.pass.cpp      |   2 +-
 .../string.cons/move_noexcept.pass.cpp        |   2 +-
 .../string.cons/pointer_alloc.pass.cpp        |   2 +-
 .../string.cons/pointer_size_alloc.pass.cpp   |   2 +-
 .../string.cons/size_char_alloc.pass.cpp      |   2 +-
 .../basic.string/string.cons/substr.pass.cpp  |   2 +-
 .../string.special/swap_noexcept.pass.cpp     |   2 +-
 .../string.accessors/get_allocator.pass.cpp   |   2 +-
 .../strings/basic.string/test_allocator.h     |  75 -----------
 .../{containers => support}/test_allocator.h  |  56 +++++++--
 .../func.wrap.func.con/alloc.pass.cpp         |   2 +-
 .../func.wrap.func.con/alloc_F.pass.cpp       |   2 +-
 .../alloc_function.pass.cpp                   |   2 +-
 .../func.wrap.func.con/alloc_nullptr.pass.cpp |   2 +-
 .../alloc_rfunction.pass.cpp                  |   2 +-
 .../assign_F_alloc.pass.cpp                   |   2 +-
 .../func.wrap/func.wrap.func/test_allocator.h | 117 ------------------
 .../util.smartptr.shared/test_allocator.h     |  82 ------------
 .../nullptr_t_deleter_allocator.pass.cpp      |   2 +-
 ...nullptr_t_deleter_allocator_throw.pass.cpp |   2 +-
 .../pointer_deleter_allocator.pass.cpp        |   2 +-
 .../pointer_deleter_allocator_throw.pass.cpp  |   2 +-
 .../allocate_shared.pass.cpp                  |   2 +-
 .../reset_pointer_deleter_allocator.pass.cpp  |   2 +-
 324 files changed, 366 insertions(+), 719 deletions(-)
 delete mode 100644 libcxx/test/re/test_allocator.h
 delete mode 100644 libcxx/test/strings/basic.string/test_allocator.h
 rename libcxx/test/{containers => support}/test_allocator.h (69%)
 delete mode 100644 libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
 delete mode 100644 libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h

diff --git a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
index 92146734d214..2292c47ef74b 100644
--- a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
index dcb0856a7444..56b3c3315e08 100644
--- a/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
index 15d1a4eb5070..be5274133082 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
index 1512e2dfdfbd..fcbe5976d6da 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
index 8bd45a3646d1..ac05e291067c 100644
--- a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
index d673c6d673e1..6c6b6140f0fc 100644
--- a/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
index a563371aca9d..c60f2e7e8bab 100644
--- a/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index 93930fc9e850..765428a631e5 100644
--- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
index 81fa3c8225e6..67fb5d644762 100644
--- a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
index 0a0ca4455852..c06f2ee5021b 100644
--- a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
index d377ad87d85a..1845e88b7a57 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
index 8b0eca742562..6d285fce0002 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
index 3bc1e68585fc..d12f9a9784fb 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
index e9ec12029277..6de4b67b3267 100644
--- a/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
index dc925fda87d9..57588e6ff169 100644
--- a/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
@@ -17,7 +17,7 @@
 
 #include <map>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_compare.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
index ef2ef0403797..b8b786351666 100644
--- a/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
index 5b494c92303f..87bf0447e5be 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
index c578b20723a1..1224884939cf 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
index 7edcc5121bfb..3d6626eaadbb 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
index c5b87aaa0d92..22594e32d718 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
index c7a0e49588f7..f00f0fed1667 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
index a144ba9406d2..315efd15276c 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
index 14e3f6400c23..50d8f42a9aba 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
index c65c36b4aaa2..0e73f72793e5 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <cassert>
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
index dfd946e3be51..259fbd145ff6 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
index 06bab095f031..aed08867c3cc 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index 7f5f0f7f2b0a..651993a769f2 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
index e02a9888bb47..496e5357279a 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
index ddb4e484bd2d..b2488180c5ee 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
index 6ea069949400..84316a1ea067 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
index d403774b6e56..effec2be0920 100644
--- a/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
@@ -17,7 +17,7 @@
 
 #include <map>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_compare.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
index b07d56a21586..687c44385da1 100644
--- a/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
index 0a5176a41c93..0a7572275afa 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
index 41bf248bbad3..76c9f8b2a8a1 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
index c6b28226f14b..dde362872109 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
index 3bde9d6d13f3..04a769e73328 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
index 8636420f04c3..19bdd713e9fc 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
index 2e3e56ef5ef8..a0bdb0786c2a 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
index f04ae9457e1e..658af1a89de8 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
index d0eebadc6c56..83114893a1b2 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
index b6d25d6ec5f4..4ed00c7124cc 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "test_iterators.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
index a5195f7eb6f6..40321cd247e1 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
index d518fb2b6d4f..1a0b065f8b9f 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
index 2af24ce9d597..0b0ce44cb8d8 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
index e5ce3498164c..cef3f2024870 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
index 8f2b49604ca4..e18f3f5f1bfe 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
index 0b4a7a70283b..222985a08f7f 100644
--- a/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
@@ -15,7 +15,7 @@
 
 #include <set>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_compare.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
index dd2878706be1..531fe801a160 100644
--- a/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp
index 4506eaf65177..67433ff88a01 100644
--- a/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
index fb7b36021ff4..22b3328d4d79 100644
--- a/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
index df54cd3090bf..a0e34e48de43 100644
--- a/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
index 9e244fe9d6da..1ad03dc1404d 100644
--- a/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
index 0bf6d1be2c59..ae83eb3c9f86 100644
--- a/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
index 6cf394e6454e..4d5754a9e6be 100644
--- a/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
index 66adff0a8365..25f5425c75a6 100644
--- a/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
index d4021acfc306..821820a1e0ce 100644
--- a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
index 1ae4634a5b7c..5ccb6e5cbcd7 100644
--- a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
@@ -24,7 +24,7 @@
 
 #include "test_iterators.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
index 53d4bd6dcfd9..4026ec70c3e1 100644
--- a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
index f50ce006ab33..c4617f0b481e 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
index 48a799e49833..4e08f014ebe9 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
@@ -18,7 +18,7 @@
 
 #include "../../../MoveOnly.h"
 #include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
index 35683b1b67e7..17ea74036dbf 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
index c3df4cace68e..7a8ae7bf2b59 100644
--- a/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp
index 6f7d0bf5a98f..c9cffc68a128 100644
--- a/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp
@@ -15,7 +15,7 @@
 
 #include <set>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_compare.h"
 
 int main()
diff --git a/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
index 2ce1d8c5eae4..c4f169aa5127 100644
--- a/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
index a0b17a152fd5..b102f117d48f 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
index 8a204d7d6f73..4d99fc14728b 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
index 95ee9128e970..66ca614126f4 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
index 26139fb76a02..643b0c625abb 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
index 84990851b9c4..a5a073c079be 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
@@ -25,7 +25,7 @@ make(int n)
     return c;
 }
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
index e102fd4b000a..d4df36cf2af9 100644
--- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
@@ -29,7 +29,7 @@ make(int n)
     return c;
 }
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct test
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
index c8a2d123814d..b3ee758182a5 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 struct test
     : private std::queue<int, std::deque<int, test_allocator<int> > >
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
index 4e07e3d04b09..16ba1747dd8a 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
index 9ac82f7b89b3..70eaa18f9e25 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index a9bc8334b53d..b752238056b6 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
index 8e0efbbc3f6f..11b4ecd3b0a9 100644
--- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
index 1a98cb5c8307..94899d4f1b54 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 struct test
     : private std::stack<int, std::deque<int, test_allocator<int> > >
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
index 2fd06ee3a300..fe8622751c95 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
index 4a15c7920575..33cb4dd52b3c 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 C
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index 87a7963cc791..16ba9d76cd0a 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
index 98496d3c7cff..19d968a08549 100644
--- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <stack>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
index 1bb672cb1c2f..841bfd9f8a7f 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
index 8f79e122609c..fa0c1203ede9 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <deque>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
index 9cf660cfb8c8..efea4948eba1 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
index fef1bb01b015..3605a1b636fe 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
index 15e082e45574..0f459b2c9194 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
index a2529b416a2e..36c5af60ee34 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
index 89d9b34e5e91..b8c3e889929d 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class InputIterator, class Allocator>
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
index e2fb7e61f154..a20ad4cecbd9 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
index f801ceb60e73..0ba4a2da330e 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
index eaab0f7cc85f..bb01dc5c54be 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
index 87b0f0eeac0c..c2bb40a8b6f1 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
index 4375a27a172a..36f780703c02 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
index 4cbb0fb0249f..3a6ec8370b84 100644
--- a/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <deque>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
index 035bcea37c3f..808144c9ebea 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <deque>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
index c41e88be17af..d55d719c7625 100644
--- a/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/deque/types.pass.cpp b/libcxx/test/containers/sequences/deque/types.pass.cpp
index 71cb54032f19..d32b65c9004f 100644
--- a/libcxx/test/containers/sequences/deque/types.pass.cpp
+++ b/libcxx/test/containers/sequences/deque/types.pass.cpp
@@ -33,7 +33,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../Copyable.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
index d9cedc487890..d274bc030881 100644
--- a/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <complex>
 #include <string>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 using std::experimental::dynarray;
 
diff --git a/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp b/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
index f0cd78434c87..9b8240d4cd82 100644
--- a/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
+++ b/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
@@ -18,7 +18,7 @@
 #if _LIBCPP_STD_VER > 11
 
 #include <experimental/dynarray>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 using std::experimental::dynarray;
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
index 044197ad66e4..cd4d1ede1201 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
index 07a8e22e0165..7aba906ec20d 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
index 0de0d99fd526..0b9263db9899 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
index ee4130127eec..a3d270f01d9a 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
index 0759418a4b34..2fc53bc3a514 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
index 9ff8215ff8ed..bcc24e1cc68e 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
index 2236048d038b..6b0233d65b6e 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
index 9f12ced1e330..1f7b05efd66a 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
index e6e2f1249800..750486b829f2 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
index 41de1eb05598..164801a0b409 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
index c43b3c19079d..ba0cb5d3bebc 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../MoveOnly.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
index b19e6dcfe39f..cc5b9d54ed35 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
index d3a3d5237468..3666c7d169db 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
index d0810f9df2f5..d72c3581022d 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "test_iterators.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
index 6d92c68165c5..1d631ab12ba1 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
index 9c3a5466d9f8..2b2be7b6c222 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
@@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
index aa34ce95098b..d6ba5a47cbe6 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
@@ -15,7 +15,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
index 777a6668882a..cde97d5f7384 100644
--- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
index 6426e01202d3..b851eb9dc5a0 100644
--- a/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
index 3bcd82414a89..99f0a98204fd 100644
--- a/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
index 41e72f79de77..530690a925d4 100644
--- a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "DefaultOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
index f11e870805bb..99fe9f115f94 100644
--- a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "DefaultOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
index 3967fd6fac18..f821fb4e7bb4 100644
--- a/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
index 7ba1f461b422..13c7e5b5797e 100644
--- a/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
index 9720a3d0d3c2..4a85e378c1ce 100644
--- a/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
index ced38b47361a..44782b910758 100644
--- a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
index 78e144559b75..4730755db81d 100644
--- a/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <list>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
index 63e1b7ae47f9..d502e1c09c8f 100644
--- a/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
index f49c565b9fa2..2c10443f76b7 100644
--- a/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
index 9f790cd22f6c..bc5f4857edc7 100644
--- a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
index f2d6cc1763a0..7a23398e80af 100644
--- a/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
index e524e1a97614..9501799ae3d0 100644
--- a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
index b3bb0f157eea..df98c817fd59 100644
--- a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
index f7ec5db5e9bd..51ecbb1d2763 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
index 65f2ed504d2a..93ecbe87c380 100644
--- a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>
 
 #include "min_allocator.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
index b9ce87c216d5..58822782ff8b 100644
--- a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
index 2b5cae68a8b2..2f0192b995ad 100644
--- a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
index 2f7720664e67..b94588ead93b 100644
--- a/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
index 9c0b4e494e55..682e74ef03c2 100644
--- a/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
index c86b644ab44c..aea3ad763cde 100644
--- a/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
index 1b3fe49eea7c..e877292ced77 100644
--- a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
index 7b157fb580eb..deee93261971 100644
--- a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
index 8aaa77096d40..b580eb4ae3b0 100644
--- a/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
index 364c3024abba..ab32bd0677b8 100644
--- a/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
index f30e3473c23a..a92c6a6c165f 100644
--- a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
index 99fa51fa9107..bcaf161119fa 100644
--- a/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
index 8cc9cb9990eb..b266b3bbb927 100644
--- a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
+++ b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
@@ -31,7 +31,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../Copyable.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/vector/types.pass.cpp b/libcxx/test/containers/sequences/vector/types.pass.cpp
index c0645878f45c..3504de6f75d6 100644
--- a/libcxx/test/containers/sequences/vector/types.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/types.pass.cpp
@@ -33,7 +33,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../Copyable.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
index 1ad4bfcf8beb..6f02c3b7bc2b 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
index 335525475c70..1365038cbc14 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
index 7321f9397515..f8b66f4b6dae 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../NotConstructible.h"
 #include "../../../stack_allocator.h"
 #include "min_allocator.h"
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
index 0cff78dd04f5..c6bbf6eca8fa 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
@@ -16,7 +16,7 @@
 
 #include "DefaultOnly.h"
 #include "min_allocator.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class C>
 void
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
index 78e7fac79ffc..6962f7035ae5 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
index b0e07db29b0e..7ff2a1e1737c 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class C>
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
index 5c378c5d14f1..3fc33b68d39a 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
index 843c067bb48b..0d73e9ef4d44 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
index d449f2a655e4..b57d2ed17f61 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 6b9be7b3df50..f09e3467ac30 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
index 2640593ec275..0aac64dc0c4e 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
index 30ff5be4741b..158370f4e1a9 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
index 57e03225af04..a2e36ccdf082 100644
--- a/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
index 9fa1274162a9..a7d0c40d6974 100644
--- a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
index 714bd4591055..996712a33aa3 100644
--- a/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp
index d0e16206b59b..6e6503e306ad 100644
--- a/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../test_compare.h"
 #include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
index 9267f1f927f6..0fc76db0fb2f 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
index 987d339cbb62..928377b3a04a 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
index a98c9007719a..dd57c58214fa 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
index 1aa67efa5a61..227343e6d5b7 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
index 800bc59f44c0..d1757d8a3c1b 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
index 1adaba985874..42f1faaeade3 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
index ebf8e1374aed..df8c7b57c932 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_hash.h"
 
 template <class T>
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
index 5d2e4c4ac24c..1fc37f7594db 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
index 60895ddb7ef2..dbc48f816c8b 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
index e1591054d79b..ac09053b1ebc 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
index 59b488f05aa7..7a4130bde8fa 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
index e2c0de7cb5a6..036008c0b863 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
@@ -23,7 +23,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
index e7ae08eee123..7c83192b664c 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -23,7 +23,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
index 379ce22a63ec..18e6683011c8 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
index ae2f2f7dc681..091a72f0d160 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
index 27174b3288f8..f7fde37869ae 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
index 3a97097a1552..1c86dd3902a2 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
index 8026c0135ee3..c1784d63b293 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
@@ -25,7 +25,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
index 2f01ba04d15b..f914b3060718 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
@@ -25,7 +25,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
index 0aaf1d453db2..7a0dbceb17c1 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
@@ -26,7 +26,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
index cc07ff202a54..61eef5bc40a4 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
@@ -26,7 +26,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
index b67258734cc6..99493fad32c5 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -27,7 +27,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
index 7881f708a25a..0a3ae3a117f1 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
index 05d6937bf912..708dc2362739 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
index 0d54d5e2c574..6c975ec72030 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
index 83e0ffc3fa5b..8b2bb317987e 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
index 0b7754606f04..bcf7b91503ad 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
index 579b6d5505ed..49ac757eefb0 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
index 44a6b8f6785d..6993a7e3ffe3 100644
--- a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp
index e68fcd5216ec..12822a9e329c 100644
--- a/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../test_compare.h"
 #include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 #include "min_allocator.h"
 
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
index b8ceb36cce44..dc41fad29af8 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
index 20b4da3f0028..4f47c781e4b8 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
index 4bac2a86c489..2d3c1434d69f 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
index f9aa41647a1f..0c43fa8f06ed 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
index e89667394b65..d71838f1dfb4 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
index fc3f31add16e..2a064c5b5f62 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
index 34b26f893331..b7a01a458d57 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
index cc8bb72198a4..9812a45203b5 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_hash.h"
 
 template <class T>
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
index f6c8551b8e11..ae2a96e2ac43 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
index 45a56d7c7152..cc5532adbe08 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
index 1c1b5f25fda3..48239db1fa22 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
index 45b4400d1bad..ff0054677055 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
index 370bc53d6d3b..095e9c327f0e 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
@@ -23,7 +23,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
index a115d167bcad..d2f698ac2bcb 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -23,7 +23,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
index 5f24df230a27..fd70ff10a70a 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
index 25f11932a885..d958e23ddd04 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
@@ -24,7 +24,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
index ee69b33ae924..078693d52b2a 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
index 7eb5f3201488..44565d115035 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
index 5849ece238c6..bb700ec565dc 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
@@ -25,7 +25,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
index 58006fb16c36..a3fd4d14573d 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
@@ -25,7 +25,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
index a54bc5ba0ec3..4e7b1ac17a20 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
@@ -26,7 +26,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
index ca48b5e6cc01..879e6811f2d9 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
@@ -26,7 +26,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
index 3208c7813b29..8e42ca7245ee 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -27,7 +27,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
index 787e9304fec1..44cf84ff323c 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
index cfc7b1ad6bb8..bd56a41fd71f 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
index ea20b6bfe196..33460612ce3f 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
index 5fb433ad113d..c2420ce9e6f5 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
index 1512f36e601b..33886670b3b4 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
index 227a700fe184..a7700b4de69c 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
index 286b574061f6..a73d7fc51daa 100644
--- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp
index 5c2ea2358c1b..275ff4094e81 100644
--- a/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../test_compare.h"
 #include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
index ca7169e5c786..ccd21a58b22c 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
index 6a2cd8ef0813..f63499485c60 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
index 7baf89a26c27..4eaf2c5779f3 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
index 94b78c7434b5..4b0e52c5930c 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
index d778861c0290..94241830a06c 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
index 37d8ed6541d8..22e372bb3ad1 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
index 220aa94edd0b..6726bc127fbc 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
index 84bd140e0749..0effeed911bb 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_hash.h"
 
 template <class T>
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
index 03b33fffa4d9..c4c54a5a0dd6 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
index fbb39ea304f0..416c28cf83db 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
index e1331da9f111..a6543a0e6f46 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
index 2894700c6964..7d0f37163a1f 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
index 7644bd3750d9..cd013f9554ae 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
index ef798657bd32..4621c7fbb3ff 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
index 697ecf5518a4..a68cfe8cd3bb 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
index daa26f28381d..9eee69a58e5d 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
index 8d601533174d..8a56d1a48592 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
index 7ef3ca6dab83..aa7ad05afadf 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
index 6f3caeedff03..cd2bb1e7bbcd 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
@@ -23,7 +23,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
index 9538cde542c9..4f5e03e28f4e 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
@@ -23,7 +23,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
index 2b83cb0ea0a1..6b83bde9bc5e 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
@@ -24,7 +24,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
index cccd74b97da4..89e7c7fa2e3d 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
@@ -24,7 +24,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
index 3675a240ef19..b712a96f05bc 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -25,7 +25,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
index 61cfc5e97c9a..e55db7ca2aaf 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
index 6ffdbfd54e03..35bfbe331b41 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
index c0ec5af41dba..0171ea64ebb1 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
index 4d7b3f61999a..785cdf246368 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
index 9d913e739cb2..50dd3c95ee52 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
index 95c84f488881..40dac3cc070e 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
index c2e068edffaf..624b81c5eb3e 100644
--- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp
index 44976063c401..89ec986d08f3 100644
--- a/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../test_compare.h"
 #include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
index 3e2213432b2b..30905aeb9fe2 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
index e53656a0fdd1..a1f8c488200e 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
index 55c8df6db972..69d19a4dac2e 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
index 50ce419fe98e..e8712b7431c4 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
index dbed56c37e48..ee05acd6be90 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
index 4265e3092f71..8e1ecd8167f2 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
index 6eaa8c25b550..ee901fb1c1f2 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
index 5063d51e3346..b3cd9c3f1ff4 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "../../../test_hash.h"
 
 template <class T>
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
index 3e468e9d6c71..68ef7f4f9aeb 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
index 8e5938eb62c8..2c31d575b635 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
index 4872babc6086..36dab799c789 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
index 2905c042cd04..81af2b41bae2 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
index 04c7b8aa4099..f35dd1afa876 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
index e8875ab6e467..34ff62ea77b5 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
index 11191a1783ab..6bda4afc99cf 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
index c9770579e1e8..229e79925f23 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
@@ -21,7 +21,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
index 176e9c5b4d30..c3c94fd1a04d 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
index 67f16c3c6c00..791a67d2119a 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
index 24a6e3579a29..40f3f4f4d7f9 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
@@ -23,7 +23,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
index e4ed1343b814..179f73d7e184 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
@@ -23,7 +23,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
index b0e568ac1174..60350de962c7 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
@@ -24,7 +24,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
index 90c419b6ffc2..70e82d034647 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
@@ -24,7 +24,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
index 0f8925868c51..a6fb2e667ae1 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -25,7 +25,7 @@
 #include "test_iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
index d5d5706e3490..389c54c58cde 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
index 450f2dd7bb9e..8f6228ad8ec4 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
index b2b7da7fa3db..4c2c18edd1ce 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
index 9a52988cd9ce..e9368782ad9a 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
index d20e03fb6000..96233e187af5 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
@@ -21,7 +21,7 @@
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
index 508d567b16f2..359e2968cc29 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_comp
diff --git a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
index f529ad6325ef..7415e2977716 100644
--- a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
+++ b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp b/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp
index d604d2728008..04367953ad29 100644
--- a/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp
+++ b/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp
@@ -16,7 +16,7 @@
 #include <regex>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class CharT, class Allocator>
 void
diff --git a/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp b/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp
index 15c49157668e..a24c669f657d 100644
--- a/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp
+++ b/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp
@@ -16,7 +16,7 @@
 #include <regex>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class CharT, class Allocator>
 void
diff --git a/libcxx/test/re/re.results/re.results.form/form2.pass.cpp b/libcxx/test/re/re.results/re.results.form/form2.pass.cpp
index 9e82c1f6bfe6..b18b7fb9f555 100644
--- a/libcxx/test/re/re.results/re.results.form/form2.pass.cpp
+++ b/libcxx/test/re/re.results/re.results.form/form2.pass.cpp
@@ -22,7 +22,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/re/re.results/re.results.form/form3.pass.cpp b/libcxx/test/re/re.results/re.results.form/form3.pass.cpp
index d8e39585ee39..27f2388adce0 100644
--- a/libcxx/test/re/re.results/re.results.form/form3.pass.cpp
+++ b/libcxx/test/re/re.results/re.results.form/form3.pass.cpp
@@ -21,7 +21,7 @@
 #include <regex>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/re/test_allocator.h b/libcxx/test/re/test_allocator.h
deleted file mode 100644
index eed33a0e3eac..000000000000
--- a/libcxx/test/re/test_allocator.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
-    static int count;
-public:
-    static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
-    : public test_alloc_base
-{
-    int data_;
-
-    template <class U> friend class test_allocator;
-public:
-
-    typedef unsigned                                                   size_type;
-    typedef int                                                        difference_type;
-    typedef T                                                          value_type;
-    typedef value_type*                                                pointer;
-    typedef const value_type*                                          const_pointer;
-    typedef typename std::add_lvalue_reference<value_type>::type       reference;
-    typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
-    template <class U> struct rebind {typedef test_allocator<U> other;};
-
-    test_allocator() throw() : data_(-1) {}
-    explicit test_allocator(int i) throw() : data_(i) {}
-    test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {}
-    template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {}
-    ~test_allocator() throw() {data_ = 0;}
-    pointer address(reference x) const {return &x;}
-    const_pointer address(const_reference x) const {return &x;}
-    pointer allocate(size_type n, const void* = 0)
-        {
-            if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw std::bad_alloc();
-#else
-                std::terminate();
-#endif
-            }
-            ++count;
-            return (pointer)std::malloc(n * sizeof(T));
-        }
-    void deallocate(pointer p, size_type n)
-        {std::free(p);}
-    size_type max_size() const throw()
-        {return UINT_MAX / sizeof(T);}
-    void construct(pointer p, const T& val)
-        {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void construct(pointer p, T&& val)
-        {::new(p) T(std::move(val));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void destroy(pointer p) {p->~T();}
-
-    friend bool operator==(const test_allocator& x, const test_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const test_allocator& x, const test_allocator& y)
-        {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
-    int data_;
-
-    template <class U> friend class other_allocator;
-
-public:
-    typedef T value_type;
-
-    other_allocator() : data_(-1) {}
-    explicit other_allocator(int i) : data_(i) {}
-    template <class U> other_allocator(const other_allocator<U>& a)
-        : data_(a.data_) {}
-    T* allocate(std::size_t n)
-        {return (T*)std::malloc(n * sizeof(T));}
-    void deallocate(T* p, std::size_t n)
-        {std::free(p);}
-
-    other_allocator select_on_container_copy_construction() const
-        {return other_allocator(-2);}
-
-    friend bool operator==(const other_allocator& x, const other_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const other_allocator& x, const other_allocator& y)
-        {return !(x == y);}
-
-    typedef std::true_type propagate_on_container_copy_assignment;
-    typedef std::true_type propagate_on_container_move_assignment;
-    typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-    std::size_t max_size() const
-        {return UINT_MAX / sizeof(T);}
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif  // TEST_ALLOCATOR_H
diff --git a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp
index 4a447d5a8f05..bae762155527 100644
--- a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp
index b15b56977ecb..512d11827551 100644
--- a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp
index fb6001f85b60..9c9fc3230668 100644
--- a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
index d18241e565ae..cf8021019a2e 100644
--- a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
index ed68c93c7f3a..f935db83d73a 100644
--- a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
@@ -17,7 +17,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
index c4550833fb22..b3cc127fbc46 100644
--- a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 #if __has_feature(cxx_noexcept)
 
diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
index 60e62cc288c4..d6ff8504e9da 100644
--- a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 int main()
diff --git a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
index 11f2b43c4cab..664cb80b10fe 100644
--- a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "../input_iterator.h"
 #include "min_allocator.h"
 
diff --git a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
index 873e8891094d..b94f189ecb46 100644
--- a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
@@ -16,7 +16,7 @@
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
index 1f0d5cd7ca7d..4e8b038ee845 100644
--- a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
@@ -16,7 +16,7 @@
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 
diff --git a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
index fdcf4785fbc4..32c9514a9154 100644
--- a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
index 60de3b029bfc..5bc1c8a9153f 100644
--- a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
@@ -17,7 +17,7 @@
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
index 42e828b88383..556aabdc44a1 100644
--- a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
@@ -17,7 +17,7 @@
 #include <string>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
index 8aa88c9fe726..f6e9e00e590f 100644
--- a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class charT>
diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
index 629e2967b25f..f1f107af20bb 100644
--- a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class charT>
diff --git a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
index a8e6fdf24f0f..4dfe9063a23e 100644
--- a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class charT>
diff --git a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
index 3e04a97bdcc6..2a9bf2ac88bb 100644
--- a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
index 01767e48e84e..4d5d79693d0a 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 
 template <class T>
 struct some_alloc
diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
index b3892d72de57..6ba040d2635d 100644
--- a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../test_allocator.h"
+#include "test_allocator.h"
 #include "min_allocator.h"
 
 template <class S>
diff --git a/libcxx/test/strings/basic.string/test_allocator.h b/libcxx/test/strings/basic.string/test_allocator.h
deleted file mode 100644
index 89852159d3cc..000000000000
--- a/libcxx/test/strings/basic.string/test_allocator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
-    static int count;
-public:
-    static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
-    : public test_alloc_base
-{
-    int data_;
-
-    template <class U> friend class test_allocator;
-public:
-
-    typedef unsigned                                                   size_type;
-    typedef int                                                        difference_type;
-    typedef T                                                          value_type;
-    typedef value_type*                                                pointer;
-    typedef const value_type*                                          const_pointer;
-    typedef typename std::add_lvalue_reference<value_type>::type       reference;
-    typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
-    template <class U> struct rebind {typedef test_allocator<U> other;};
-
-    test_allocator() throw() : data_(-1) {}
-    explicit test_allocator(int i) throw() : data_(i) {}
-    test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {}
-    template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {}
-    ~test_allocator() throw() {data_ = 0;}
-    pointer address(reference x) const {return &x;}
-    const_pointer address(const_reference x) const {return &x;}
-    pointer allocate(size_type n, const void* = 0)
-        {
-            if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw std::bad_alloc();
-#else
-                std::terminate();
-#endif
-            }
-            ++count;
-            return (pointer)std::malloc(n * sizeof(T));
-        }
-    void deallocate(pointer p, size_type n)
-        {std::free(p);}
-    size_type max_size() const throw()
-        {return UINT_MAX / sizeof(T);}
-    void construct(pointer p, const T& val)
-        {::new(p) T(val);}
-    void destroy(pointer p) {p->~T();}
-
-    friend bool operator==(const test_allocator& x, const test_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const test_allocator& x, const test_allocator& y)
-        {return !(x == y);}
-};
-
-#endif  // TEST_ALLOCATOR_H
diff --git a/libcxx/test/containers/test_allocator.h b/libcxx/test/support/test_allocator.h
similarity index 69%
rename from libcxx/test/containers/test_allocator.h
rename to libcxx/test/support/test_allocator.h
index eed33a0e3eac..3ec7f4788011 100644
--- a/libcxx/test/containers/test_allocator.h
+++ b/libcxx/test/support/test_allocator.h
@@ -6,16 +6,21 @@
 #include <cstdlib>
 #include <new>
 #include <climits>
+#include <cassert>
 
 class test_alloc_base
 {
 protected:
-    static int count;
+    static int time_to_throw;
 public:
     static int throw_after;
+    static int count;
+    static int alloc_count;
 };
 
 int test_alloc_base::count = 0;
+int test_alloc_base::time_to_throw = 0;
+int test_alloc_base::alloc_count = 0;
 int test_alloc_base::throw_after = INT_MAX;
 
 template <class T>
@@ -37,29 +42,31 @@ public:
 
     template <class U> struct rebind {typedef test_allocator<U> other;};
 
-    test_allocator() throw() : data_(-1) {}
-    explicit test_allocator(int i) throw() : data_(i) {}
+    test_allocator() throw() : data_(0) {++count;}
+    explicit test_allocator(int i) throw() : data_(i) {++count;}
     test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {}
+        : data_(a.data_) {++count;}
     template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {}
-    ~test_allocator() throw() {data_ = 0;}
+        : data_(a.data_) {++count;}
+    ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;}
     pointer address(reference x) const {return &x;}
     const_pointer address(const_reference x) const {return &x;}
     pointer allocate(size_type n, const void* = 0)
         {
-            if (count >= throw_after) {
+            assert(data_ >= 0);
+            if (time_to_throw >= throw_after) {
 #ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
 #else
                 std::terminate();
 #endif
             }
-            ++count;
+            ++time_to_throw;
+            ++alloc_count;
             return (pointer)std::malloc(n * sizeof(T));
         }
     void deallocate(pointer p, size_type n)
-        {std::free(p);}
+        {assert(data_ >= 0); --alloc_count; std::free(p);}
     size_type max_size() const throw()
         {return UINT_MAX / sizeof(T);}
     void construct(pointer p, const T& val)
@@ -76,6 +83,37 @@ public:
         {return !(x == y);}
 };
 
+template <>
+class test_allocator<void>
+    : public test_alloc_base
+{
+    int data_;
+
+    template <class U> friend class test_allocator;
+public:
+
+    typedef unsigned                                                   size_type;
+    typedef int                                                        difference_type;
+    typedef void                                                       value_type;
+    typedef value_type*                                                pointer;
+    typedef const value_type*                                          const_pointer;
+
+    template <class U> struct rebind {typedef test_allocator<U> other;};
+
+    test_allocator() throw() : data_(-1) {}
+    explicit test_allocator(int i) throw() : data_(i) {}
+    test_allocator(const test_allocator& a) throw()
+        : data_(a.data_) {}
+    template <class U> test_allocator(const test_allocator<U>& a) throw()
+        : data_(a.data_) {}
+    ~test_allocator() throw() {data_ = 0;}
+
+    friend bool operator==(const test_allocator& x, const test_allocator& y)
+        {return x.data_ == y.data_;}
+    friend bool operator!=(const test_allocator& x, const test_allocator& y)
+        {return !(x == y);}
+};
+
 template <class T>
 class other_allocator
 {
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
index ea8830b7581e..4feac30c3002 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
index 8a16313d9be9..599092258da6 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
@@ -16,7 +16,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 class A
 {
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index d5364bf42837..79fc1512ac57 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
@@ -18,7 +18,7 @@
 #include <cstdlib>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 int new_called = 0;
 
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
index 89efeabe18b9..956136be021b 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
@@ -16,7 +16,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
index cafc6e449462..570c27e3f85d 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
@@ -16,7 +16,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 int new_called = 0;
 
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
index ae6498b9e36c..e9ecfa5539ce 100644
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
+++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
@@ -16,7 +16,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 class A
 {
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
deleted file mode 100644
index eed33a0e3eac..000000000000
--- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
-    static int count;
-public:
-    static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
-    : public test_alloc_base
-{
-    int data_;
-
-    template <class U> friend class test_allocator;
-public:
-
-    typedef unsigned                                                   size_type;
-    typedef int                                                        difference_type;
-    typedef T                                                          value_type;
-    typedef value_type*                                                pointer;
-    typedef const value_type*                                          const_pointer;
-    typedef typename std::add_lvalue_reference<value_type>::type       reference;
-    typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
-    template <class U> struct rebind {typedef test_allocator<U> other;};
-
-    test_allocator() throw() : data_(-1) {}
-    explicit test_allocator(int i) throw() : data_(i) {}
-    test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {}
-    template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {}
-    ~test_allocator() throw() {data_ = 0;}
-    pointer address(reference x) const {return &x;}
-    const_pointer address(const_reference x) const {return &x;}
-    pointer allocate(size_type n, const void* = 0)
-        {
-            if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw std::bad_alloc();
-#else
-                std::terminate();
-#endif
-            }
-            ++count;
-            return (pointer)std::malloc(n * sizeof(T));
-        }
-    void deallocate(pointer p, size_type n)
-        {std::free(p);}
-    size_type max_size() const throw()
-        {return UINT_MAX / sizeof(T);}
-    void construct(pointer p, const T& val)
-        {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void construct(pointer p, T&& val)
-        {::new(p) T(std::move(val));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void destroy(pointer p) {p->~T();}
-
-    friend bool operator==(const test_allocator& x, const test_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const test_allocator& x, const test_allocator& y)
-        {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
-    int data_;
-
-    template <class U> friend class other_allocator;
-
-public:
-    typedef T value_type;
-
-    other_allocator() : data_(-1) {}
-    explicit other_allocator(int i) : data_(i) {}
-    template <class U> other_allocator(const other_allocator<U>& a)
-        : data_(a.data_) {}
-    T* allocate(std::size_t n)
-        {return (T*)std::malloc(n * sizeof(T));}
-    void deallocate(T* p, std::size_t n)
-        {std::free(p);}
-
-    other_allocator select_on_container_copy_construction() const
-        {return other_allocator(-2);}
-
-    friend bool operator==(const other_allocator& x, const other_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const other_allocator& x, const other_allocator& y)
-        {return !(x == y);}
-
-    typedef std::true_type propagate_on_container_copy_assignment;
-    typedef std::true_type propagate_on_container_move_assignment;
-    typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-    std::size_t max_size() const
-        {return UINT_MAX / sizeof(T);}
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif  // TEST_ALLOCATOR_H
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
deleted file mode 100644
index d9b72bce49e9..000000000000
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-#include <cassert>
-
-class test_alloc_base
-{
-protected:
-    static int time_to_throw;
-public:
-    static int throw_after;
-    static int count;
-    static int alloc_count;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::time_to_throw = 0;
-int test_alloc_base::alloc_count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
-    : public test_alloc_base
-{
-    int data_;
-
-    template <class U> friend class test_allocator;
-public:
-
-    typedef unsigned                                                   size_type;
-    typedef int                                                        difference_type;
-    typedef T                                                          value_type;
-    typedef value_type*                                                pointer;
-    typedef const value_type*                                          const_pointer;
-    typedef typename std::add_lvalue_reference<value_type>::type       reference;
-    typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
-    template <class U> struct rebind {typedef test_allocator<U> other;};
-
-    test_allocator() throw() : data_(0) {++count;}
-    explicit test_allocator(int i) throw() : data_(i) {++count;}
-    test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {++count;}
-    template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {++count;}
-    ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;}
-    pointer address(reference x) const {return &x;}
-    const_pointer address(const_reference x) const {return &x;}
-    pointer allocate(size_type n, const void* = 0)
-        {
-            assert(data_ >= 0);
-            if (time_to_throw >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw std::bad_alloc();
-#else
-                std::terminate();
-#endif
-            }
-            ++time_to_throw;
-            ++alloc_count;
-            return (pointer)std::malloc(n * sizeof(T));
-        }
-    void deallocate(pointer p, size_type n)
-        {assert(data_ >= 0); --alloc_count; std::free(p);}
-    size_type max_size() const throw()
-        {return UINT_MAX / sizeof(T);}
-    void construct(pointer p, const T& val)
-        {::new(p) T(val);}
-    void destroy(pointer p) {p->~T();}
-
-    friend bool operator==(const test_allocator& x, const test_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const test_allocator& x, const test_allocator& y)
-        {return !(x == y);}
-};
-
-#endif  // TEST_ALLOCATOR_H
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
index 509752e12b50..7966e00e0c52 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <cassert>
 #include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 struct A
 {
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
index 6d14920d6ae7..ab2c73e0c5f1 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <cassert>
 #include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 struct A
 {
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
index 98ecd1307ffa..23d3f10ed35b 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <cassert>
 #include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 struct A
 {
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
index 9b93a7cca365..4220993a5fd1 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <cassert>
 #include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 struct A
 {
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
index 5c9d9a309e45..e019837d7073 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
@@ -18,7 +18,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 int new_count = 0;
 
diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
index 42360d6ed42d..09070e2c059b 100644
--- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
+++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
@@ -16,7 +16,7 @@
 #include <memory>
 #include <cassert>
 #include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
 
 struct B
 {