From 1b92188a82b01e76ac6e8ad5f997293c2a078adc 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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@196174 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../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 +-
 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 +-
 test/strings/basic.string/test_allocator.h    |  75 -----------
 test/{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 test/re/test_allocator.h
 delete mode 100644 test/strings/basic.string/test_allocator.h
 rename test/{containers => support}/test_allocator.h (69%)
 delete mode 100644 test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
 delete mode 100644 test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h

diff --git a/test/containers/associative/map/map.cons/alloc.pass.cpp b/test/containers/associative/map/map.cons/alloc.pass.cpp
index 92146734d..2292c47ef 100644
--- a/test/containers/associative/map/map.cons/alloc.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/compare_alloc.pass.cpp b/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
index dcb0856a7..56b3c3315 100644
--- a/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/copy.pass.cpp b/test/containers/associative/map/map.cons/copy.pass.cpp
index 15d1a4eb5..be5274133 100644
--- a/test/containers/associative/map/map.cons/copy.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/copy_alloc.pass.cpp b/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
index 1512e2dfd..fcbe5976d 100644
--- a/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/test/containers/associative/map/map.cons/copy_assign.pass.cpp
index 8bd45a364..ac05e2910 100644
--- a/test/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/default_noexcept.pass.cpp b/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
index d673c6d67..6c6b6140f 100644
--- a/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
index a563371ac..c60f2e7e8 100644
--- a/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index 93930fc9e..765428a63 100644
--- a/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
index 81fa3c822..67fb5d644 100644
--- a/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/move.pass.cpp b/test/containers/associative/map/map.cons/move.pass.cpp
index 0a0ca4455..c06f2ee50 100644
--- a/test/containers/associative/map/map.cons/move.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/test/containers/associative/map/map.cons/move_alloc.pass.cpp
index d377ad87d..1845e88b7 100644
--- a/test/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/move_assign.pass.cpp b/test/containers/associative/map/map.cons/move_assign.pass.cpp
index 8b0eca742..6d285fce0 100644
--- a/test/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
index 3bc1e6858..d12f9a978 100644
--- a/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/associative/map/map.cons/move_noexcept.pass.cpp b/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
index e9ec12029..6de4b67b3 100644
--- a/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/associative/map/map.special/non_member_swap.pass.cpp b/test/containers/associative/map/map.special/non_member_swap.pass.cpp
index dc925fda8..57588e6ff 100644
--- a/test/containers/associative/map/map.special/non_member_swap.pass.cpp
+++ b/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/test/containers/associative/map/map.special/swap_noexcept.pass.cpp b/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
index ef2ef0403..b8b786351 100644
--- a/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
index 5b494c923..87bf0447e 100644
--- a/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
index c578b2072..122488493 100644
--- a/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
index 7edcc5121..3d6626eaa 100644
--- a/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
index c5b87aaa0..22594e32d 100644
--- a/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
index c7a0e4958..f00f0fed1 100644
--- a/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
index a144ba940..315efd152 100644
--- a/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
index 14e3f6400..50d8f42a9 100644
--- a/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
index c65c36b4a..0e73f7279 100644
--- a/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
index dfd946e3b..259fbd145 100644
--- a/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/test/containers/associative/multimap/multimap.cons/move.pass.cpp
index 06bab095f..aed08867c 100644
--- a/test/containers/associative/multimap/multimap.cons/move.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index 7f5f0f7f2..651993a76 100644
--- a/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
index e02a9888b..496e53572 100644
--- a/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
index ddb4e484b..b2488180c 100644
--- a/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
index 6ea069949..84316a1ea 100644
--- a/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
index d403774b6..effec2be0 100644
--- a/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
+++ b/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/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
index b07d56a21..687c44385 100644
--- a/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
index 0a5176a41..0a7572275 100644
--- a/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
index 41bf248bb..76c9f8b2a 100644
--- a/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
index c6b28226f..dde362872 100644
--- a/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
index 3bde9d6d1..04a769e73 100644
--- a/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
index 8636420f0..19bdd713e 100644
--- a/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
index 2e3e56ef5..a0bdb0786 100644
--- a/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
index f04ae9457..658af1a89 100644
--- a/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
index d0eebadc6..83114893a 100644
--- a/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
index b6d25d6ec..4ed00c712 100644
--- a/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/test/containers/associative/multiset/multiset.cons/move.pass.cpp
index a5195f7eb..40321cd24 100644
--- a/test/containers/associative/multiset/multiset.cons/move.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
index d518fb2b6..1a0b065f8 100644
--- a/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
index 2af24ce9d..0b0ce44cb 100644
--- a/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
index e5ce34981..cef3f2024 100644
--- a/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
index 8f2b49604..e18f3f5f1 100644
--- a/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp b/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
index 0b4a7a702..222985a08 100644
--- a/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
+++ b/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/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
index dd2878706..531fe801a 100644
--- a/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/alloc.pass.cpp b/test/containers/associative/set/set.cons/alloc.pass.cpp
index 4506eaf65..67433ff88 100644
--- a/test/containers/associative/set/set.cons/alloc.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/compare_alloc.pass.cpp b/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
index fb7b36021..22b3328d4 100644
--- a/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/copy.pass.cpp b/test/containers/associative/set/set.cons/copy.pass.cpp
index df54cd309..a0e34e48d 100644
--- a/test/containers/associative/set/set.cons/copy.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/copy_alloc.pass.cpp b/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
index 9e244fe9d..1ad03dc14 100644
--- a/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/test/containers/associative/set/set.cons/copy_assign.pass.cpp
index 0bf6d1be2..ae83eb3c9 100644
--- a/test/containers/associative/set/set.cons/copy_assign.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/default_noexcept.pass.cpp b/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
index 6cf394e64..4d5754a9e 100644
--- a/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
index 66adff0a8..25f5425c7 100644
--- a/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
index d4021acfc..821820a1e 100644
--- a/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
index 1ae4634a5..5ccb6e5cb 100644
--- a/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/move.pass.cpp b/test/containers/associative/set/set.cons/move.pass.cpp
index 53d4bd6dc..4026ec70c 100644
--- a/test/containers/associative/set/set.cons/move.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/test/containers/associative/set/set.cons/move_alloc.pass.cpp
index f50ce006a..c4617f0b4 100644
--- a/test/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/move_assign.pass.cpp b/test/containers/associative/set/set.cons/move_assign.pass.cpp
index 48a799e49..4e08f014e 100644
--- a/test/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
index 35683b1b6..17ea74036 100644
--- a/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/associative/set/set.cons/move_noexcept.pass.cpp b/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
index c3df4cace..7a8ae7bf2 100644
--- a/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/associative/set/set.special/non_member_swap.pass.cpp b/test/containers/associative/set/set.special/non_member_swap.pass.cpp
index 6f7d0bf5a..c9cffc68a 100644
--- a/test/containers/associative/set/set.special/non_member_swap.pass.cpp
+++ b/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/test/containers/associative/set/set.special/swap_noexcept.pass.cpp b/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
index 2ce1d8c5e..c4f169aa5 100644
--- a/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
index a0b17a152..b102f117d 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
index 8a204d7d6..4d99fc147 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
index 95ee9128e..66ca61412 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
index 26139fb76..643b0c625 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
index 84990851b..a5a073c07 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
index e102fd4b0..d4df36cf2 100644
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
index c8a2d1238..b3ee75818 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
index 4e07e3d04..16ba1747d 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
index 9ac82f7b8..70eaa18f9 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index a9bc8334b..b75223805 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
index 8e0efbbc3..11b4ecd3b 100644
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
index 1a98cb5c8..94899d4f1 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
index 2fd06ee3a..fe8622751 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
index 4a15c7920..33cb4dd52 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index 87a7963cc..16ba9d76c 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/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/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
index 98496d3c7..19d968a08 100644
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
index 1bb672cb1..841bfd9f8 100644
--- a/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/test/containers/sequences/deque/deque.cons/copy.pass.cpp
index 8f79e1226..fa0c1203e 100644
--- a/test/containers/sequences/deque/deque.cons/copy.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
index 9cf660cfb..efea4948e 100644
--- a/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
index fef1bb01b..3605a1b63 100644
--- a/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
index 15e082e45..0f459b2c9 100644
--- a/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
index a2529b416..36c5af60e 100644
--- a/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
index 89d9b34e5..b8c3e8899 100644
--- a/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/move.pass.cpp b/test/containers/sequences/deque/deque.cons/move.pass.cpp
index e2fb7e61f..a20ad4cec 100644
--- a/test/containers/sequences/deque/deque.cons/move.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
index f801ceb60..0ba4a2da3 100644
--- a/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
index eaab0f7cc..bb01dc5c5 100644
--- a/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
index 87b0f0eea..c2bb40a8b 100644
--- a/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
index 4375a27a1..36f780703 100644
--- a/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp b/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
index 4cbb0fb02..3a6ec8370 100644
--- a/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.special/swap.pass.cpp b/test/containers/sequences/deque/deque.special/swap.pass.cpp
index 035bcea37..808144c9e 100644
--- a/test/containers/sequences/deque/deque.special/swap.pass.cpp
+++ b/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/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
index c41e88be1..d55d719c7 100644
--- a/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/sequences/deque/types.pass.cpp b/test/containers/sequences/deque/types.pass.cpp
index 71cb54032..d32b65c90 100644
--- a/test/containers/sequences/deque/types.pass.cpp
+++ b/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/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp b/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
index d9cedc487..d274bc030 100644
--- a/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
+++ b/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/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp b/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
index f0cd78434..9b8240d4c 100644
--- a/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
index 044197ad6..cd4d1ede1 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
index 07a8e22e0..7aba906ec 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
index 0de0d99fd..0b9263db9 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
index ee4130127..a3d270f01 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
index 0759418a4..2fc53bc3a 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
index 9ff8215ff..bcc24e1cc 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
index 2236048d0..6b0233d65 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
index 9f12ced1e..1f7b05efd 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
index e6e2f1249..750486b82 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
index 41de1eb05..164801a0b 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
index c43b3c190..ba0cb5d3b 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
index b19e6dcfe..cc5b9d54e 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
index d3a3d5237..3666c7d16 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
index d0810f9df..d72c35810 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
index 6d92c6816..1d631ab12 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
index 9c3a5466d..2b2be7b6c 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
index aa34ce950..d6ba5a47c 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
+++ b/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/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
index 777a66688..cde97d5f7 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/assign_copy.pass.cpp b/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
index 6426e0120..b851eb9dc 100644
--- a/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/test/containers/sequences/list/list.cons/assign_move.pass.cpp
index 3bcd82414..99f0a9820 100644
--- a/test/containers/sequences/list/list.cons/assign_move.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/copy.pass.cpp b/test/containers/sequences/list/list.cons/copy.pass.cpp
index 41e72f79d..530690a92 100644
--- a/test/containers/sequences/list/list.cons/copy.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
index f11e87080..99fe9f115 100644
--- a/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
index 3967fd6fa..f821fb4e7 100644
--- a/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
index 7ba1f461b..13c7e5b57 100644
--- a/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
index 9720a3d0d..4a85e378c 100644
--- a/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/move.pass.cpp b/test/containers/sequences/list/list.cons/move.pass.cpp
index ced38b473..44782b910 100644
--- a/test/containers/sequences/list/list.cons/move.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
index 78e144559..4730755db 100644
--- a/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
index 63e1b7ae4..d502e1c09 100644
--- a/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
index f49c565b9..2c10443f7 100644
--- a/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/sequences/list/list.special/swap.pass.cpp b/test/containers/sequences/list/list.special/swap.pass.cpp
index 9f790cd22..bc5f4857e 100644
--- a/test/containers/sequences/list/list.special/swap.pass.cpp
+++ b/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/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
index f2d6cc176..7a23398e8 100644
--- a/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/assign_copy.pass.cpp b/test/containers/sequences/vector.bool/assign_copy.pass.cpp
index e524e1a97..9501799ae 100644
--- a/test/containers/sequences/vector.bool/assign_copy.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/assign_move.pass.cpp b/test/containers/sequences/vector.bool/assign_move.pass.cpp
index b3bb0f157..df98c817f 100644
--- a/test/containers/sequences/vector.bool/assign_move.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/construct_default.pass.cpp b/test/containers/sequences/vector.bool/construct_default.pass.cpp
index f7ec5db5e..51ecbb1d2 100644
--- a/test/containers/sequences/vector.bool/construct_default.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/construct_size.pass.cpp b/test/containers/sequences/vector.bool/construct_size.pass.cpp
index 65f2ed504..93ecbe87c 100644
--- a/test/containers/sequences/vector.bool/construct_size.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/copy.pass.cpp b/test/containers/sequences/vector.bool/copy.pass.cpp
index b9ce87c21..58822782f 100644
--- a/test/containers/sequences/vector.bool/copy.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/copy_alloc.pass.cpp b/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
index 2b5cae68a..2f0192b99 100644
--- a/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/default_noexcept.pass.cpp b/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
index 2f7720664..b94588ead 100644
--- a/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp b/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
index 9c0b4e494..682e74ef0 100644
--- a/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
index c86b644ab..aea3ad763 100644
--- a/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/move.pass.cpp b/test/containers/sequences/vector.bool/move.pass.cpp
index 1b3fe49ee..e877292ce 100644
--- a/test/containers/sequences/vector.bool/move.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/test/containers/sequences/vector.bool/move_alloc.pass.cpp
index 7b157fb58..deee93261 100644
--- a/test/containers/sequences/vector.bool/move_alloc.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp b/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
index 8aaa77096..b580eb4ae 100644
--- a/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/move_noexcept.pass.cpp b/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
index 364c3024a..ab32bd067 100644
--- a/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/swap.pass.cpp b/test/containers/sequences/vector.bool/swap.pass.cpp
index f30e3473c..a92c6a6c1 100644
--- a/test/containers/sequences/vector.bool/swap.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp b/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
index 99fa51fa9..bcaf16111 100644
--- a/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector.bool/types.pass.cpp b/test/containers/sequences/vector.bool/types.pass.cpp
index 8cc9cb999..b266b3bbb 100644
--- a/test/containers/sequences/vector.bool/types.pass.cpp
+++ b/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/test/containers/sequences/vector/types.pass.cpp b/test/containers/sequences/vector/types.pass.cpp
index c0645878f..3504de6f7 100644
--- a/test/containers/sequences/vector/types.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp b/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
index 1ad4bfcf8..6f02c3b7b 100644
--- a/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
index 335525475..1365038cb 100644
--- a/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
index 7321f9397..f8b66f4b6 100644
--- a/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
index 0cff78dd0..c6bbf6eca 100644
--- a/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/test/containers/sequences/vector/vector.cons/copy.pass.cpp
index 78e7fac79..6962f7035 100644
--- a/test/containers/sequences/vector/vector.cons/copy.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
index b0e07db29..7ff2a1e17 100644
--- a/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
index 5c378c5d1..3fc33b68d 100644
--- a/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
index 843c067bb..0d73e9ef4 100644
--- a/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
index d449f2a65..b57d2ed17 100644
--- a/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/move.pass.cpp b/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 6b9be7b3d..f09e3467a 100644
--- a/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
index 2640593ec..0aac64dc0 100644
--- a/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
index 30ff5be47..158370f4e 100644
--- a/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
index 57e03225a..a2e36ccdf 100644
--- a/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.special/swap.pass.cpp b/test/containers/sequences/vector/vector.special/swap.pass.cpp
index 9fa127416..a7d0c40d6 100644
--- a/test/containers/sequences/vector/vector.special/swap.pass.cpp
+++ b/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/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
index 714bd4591..996712a33 100644
--- a/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.map/swap_member.pass.cpp b/test/containers/unord/unord.map/swap_member.pass.cpp
index d0e16206b..6e6503e30 100644
--- a/test/containers/unord/unord.map/swap_member.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
index 9267f1f92..0fc76db0f 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
index 987d339cb..928377b3a 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
index a98c90077..dd57c5821 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
index 1aa67efa5..227343e6d 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
index 800bc59f4..d1757d8a3 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
index 1adaba985..42f1faaea 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
index ebf8e1374..df8c7b57c 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
index 5d2e4c4ac..1fc37f759 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
index 60895ddb7..dbc48f816 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
index e1591054d..ac09053b1 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
index 59b488f05..7a4130bde 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
index e2c0de7cb..036008c0b 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
index e7ae08eee..7c83192b6 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
index 379ce22a6..18e668301 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
index ae2f2f7dc..091a72f0d 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
index 27174b328..f7fde3786 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
index 3a97097a1..1c86dd390 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
index 8026c0135..c1784d63b 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
index 2f01ba04d..f914b3060 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
index 0aaf1d453..7a0dbceb1 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
index cc07ff202..61eef5bc4 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
index b67258734..99493fad3 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
index 7881f708a..0a3ae3a11 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
index 05d6937bf..708dc2362 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
index 0d54d5e2c..6c975ec72 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
index 83e0ffc3f..8b2bb3179 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
index 0b7754606..bcf7b9150 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
index 579b6d550..49ac757ee 100644
--- a/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
index 44a6b8f67..6993a7e3f 100644
--- a/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/swap_member.pass.cpp b/test/containers/unord/unord.multimap/swap_member.pass.cpp
index e68fcd521..12822a9e3 100644
--- a/test/containers/unord/unord.multimap/swap_member.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
index b8ceb36cc..dc41fad29 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
index 20b4da3f0..4f47c781e 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
index 4bac2a86c..2d3c1434d 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
index f9aa41647..0c43fa8f0 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
index e89667394..d71838f1d 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
index fc3f31add..2a064c5b5 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
index 34b26f893..b7a01a458 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
index cc8bb7219..9812a4520 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
index f6c8551b8..ae2a96e2a 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
index 45a56d7c7..cc5532adb 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
index 1c1b5f25f..48239db1f 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
index 45b4400d1..ff0054677 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
index 370bc53d6..095e9c327 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
index a115d167b..d2f698ac2 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
index 5f24df230..fd70ff10a 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
index 25f11932a..d958e23dd 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
index ee69b33ae..078693d52 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
index 7eb5f3201..44565d115 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
index 5849ece23..bb700ec56 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
index 58006fb16..a3fd4d145 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
index a54bc5ba0..4e7b1ac17 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
index ca48b5e6c..879e6811f 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
index 3208c7813..8e42ca724 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
index 787e9304f..44cf84ff3 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
index cfc7b1ad6..bd56a41fd 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
index ea20b6bfe..33460612c 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
index 5fb433ad1..c2420ce9e 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
index 1512f36e6..33886670b 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
index 227a700fe..a7700b4de 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
index 286b57406..a73d7fc51 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/swap_member.pass.cpp b/test/containers/unord/unord.multiset/swap_member.pass.cpp
index 5c2ea2358..275ff4094 100644
--- a/test/containers/unord/unord.multiset/swap_member.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
index ca7169e5c..ccd21a58b 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
index 6a2cd8ef0..f63499485 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
index 7baf89a26..4eaf2c577 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
index 94b78c743..4b0e52c59 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
index d778861c0..94241830a 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
index 37d8ed654..22e372bb3 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
index 220aa94ed..6726bc127 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
index 84bd140e0..0effeed91 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
index 03b33fffa..c4c54a5a0 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
index fbb39ea30..416c28cf8 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
index e1331da9f..a6543a0e6 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
index 2894700c6..7d0f37163 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
index 7644bd375..cd013f955 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
index ef798657b..4621c7fbb 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
index 697ecf551..a68cfe8cd 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
index daa26f283..9eee69a58 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
index 8d6015331..8a56d1a48 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
index 7ef3ca6da..aa7ad05af 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
index 6f3caeedf..cd2bb1e7b 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
index 9538cde54..4f5e03e28 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
index 2b83cb0ea..6b83bde9b 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
index cccd74b97..89e7c7fa2 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
index 3675a240e..b712a96f0 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
index 61cfc5e97..e55db7ca2 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
index 6ffdbfd54..35bfbe331 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
index c0ec5af41..0171ea64e 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
index 4d7b3f619..785cdf246 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
index 9d913e739..50dd3c95e 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
index 95c84f488..40dac3cc0 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
index c2e068edf..624b81c5e 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
+++ b/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/test/containers/unord/unord.set/swap_member.pass.cpp b/test/containers/unord/unord.set/swap_member.pass.cpp
index 44976063c..89ec986d0 100644
--- a/test/containers/unord/unord.set/swap_member.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
index 3e2213432..30905aeb9 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
index e53656a0f..a1f8c4882 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
index 55c8df6db..69d19a4da 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
index 50ce419fe..e8712b743 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
index dbed56c37..ee05acd6b 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
index 4265e3092..8e1ecd816 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
index 6eaa8c25b..ee901fb1c 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
index 5063d51e3..b3cd9c3f1 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
index 3e468e9d6..68ef7f4f9 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
index 8e5938eb6..2c31d575b 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
index 4872babc6..36dab799c 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
index 2905c042c..81af2b41b 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
index 04c7b8aa4..f35dd1afa 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
index e8875ab6e..34ff62ea7 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
index 11191a178..6bda4afc9 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
index c9770579e..229e79925 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
index 176e9c5b4..c3c94fd1a 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
index 67f16c3c6..791a67d21 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
index 24a6e3579..40f3f4f4d 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
index e4ed1343b..179f73d7e 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
index b0e568ac1..60350de96 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
index 90c419b6f..70e82d034 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
index 0f8925868..a6fb2e667 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
index d5d5706e3..389c54c58 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
index 450f2dd7b..8f6228ad8 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
index b2b7da7fa..4c2c18edd 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
index 9a52988cd..e9368782a 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
index d20e03fb6..96233e187 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
index 508d567b1..359e2968c 100644
--- a/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
+++ b/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/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp b/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
index f529ad632..7415e2977 100644
--- a/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
+++ b/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/test/re/re.results/re.results.all/get_allocator.pass.cpp b/test/re/re.results/re.results.all/get_allocator.pass.cpp
index d604d2728..04367953a 100644
--- a/test/re/re.results/re.results.all/get_allocator.pass.cpp
+++ b/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/test/re/re.results/re.results.const/allocator.pass.cpp b/test/re/re.results/re.results.const/allocator.pass.cpp
index 15c491576..a24c669f6 100644
--- a/test/re/re.results/re.results.const/allocator.pass.cpp
+++ b/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/test/re/re.results/re.results.form/form2.pass.cpp b/test/re/re.results/re.results.form/form2.pass.cpp
index 9e82c1f6b..b18b7fb9f 100644
--- a/test/re/re.results/re.results.form/form2.pass.cpp
+++ b/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/test/re/re.results/re.results.form/form3.pass.cpp b/test/re/re.results/re.results.form/form3.pass.cpp
index d8e39585e..27f2388ad 100644
--- a/test/re/re.results/re.results.form/form3.pass.cpp
+++ b/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/test/re/test_allocator.h b/test/re/test_allocator.h
deleted file mode 100644
index eed33a0e3..000000000
--- a/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/test/strings/basic.string/string.capacity/capacity.pass.cpp b/test/strings/basic.string/string.capacity/capacity.pass.cpp
index 4a447d5a8..bae762155 100644
--- a/test/strings/basic.string/string.capacity/capacity.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/alloc.pass.cpp b/test/strings/basic.string/string.cons/alloc.pass.cpp
index b15b56977..512d11827 100644
--- a/test/strings/basic.string/string.cons/alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/copy.pass.cpp b/test/strings/basic.string/string.cons/copy.pass.cpp
index fb6001f85..9c9fc3230 100644
--- a/test/strings/basic.string/string.cons/copy.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
index d18241e56..cf8021019 100644
--- a/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
index ed68c93c7..f935db83d 100644
--- a/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
index c4550833f..b3cc127fb 100644
--- a/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/test/strings/basic.string/string.cons/initializer_list.pass.cpp
index 60e62cc28..d6ff8504e 100644
--- a/test/strings/basic.string/string.cons/initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
index 11f2b43c4..664cb80b1 100644
--- a/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move.pass.cpp b/test/strings/basic.string/string.cons/move.pass.cpp
index 873e88910..b94f189ec 100644
--- a/test/strings/basic.string/string.cons/move.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/test/strings/basic.string/string.cons/move_alloc.pass.cpp
index 1f0d5cd7c..4e8b038ee 100644
--- a/test/strings/basic.string/string.cons/move_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
index fdcf4785f..32c9514a9 100644
--- a/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/test/strings/basic.string/string.cons/move_assignment.pass.cpp
index 60de3b029..5bc1c8a91 100644
--- a/test/strings/basic.string/string.cons/move_assignment.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
index 42e828b88..556aabdc4 100644
--- a/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
index 8aa88c9fe..f6e9e00e5 100644
--- a/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
index 629e2967b..f1f107af2 100644
--- a/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
index a8e6fdf24..4dfe9063a 100644
--- a/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/substr.pass.cpp b/test/strings/basic.string/string.cons/substr.pass.cpp
index 3e04a97bd..2a9bf2ac8 100644
--- a/test/strings/basic.string/string.cons/substr.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
index 01767e48e..4d5d79693 100644
--- a/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
index b3892d72d..6ba040d26 100644
--- a/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ b/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/test/strings/basic.string/test_allocator.h b/test/strings/basic.string/test_allocator.h
deleted file mode 100644
index 89852159d..000000000
--- a/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/test/containers/test_allocator.h b/test/support/test_allocator.h
similarity index 69%
rename from test/containers/test_allocator.h
rename to test/support/test_allocator.h
index eed33a0e3..3ec7f4788 100644
--- a/test/containers/test_allocator.h
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
index ea8830b75..4feac30c3 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
index 8a16313d9..599092258 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index d5364bf42..79fc1512a 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
index 89efeabe1..956136be0 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
index cafc6e449..570c27e3f 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
index ae6498b9e..e9ecfa553 100644
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
+++ b/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/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h b/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
deleted file mode 100644
index eed33a0e3..000000000
--- a/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/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h b/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
deleted file mode 100644
index d9b72bce4..000000000
--- a/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/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
index 509752e12..7966e00e0 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
+++ b/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/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
index 6d14920d6..ab2c73e0c 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
+++ b/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/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
index 98ecd1307..23d3f10ed 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
+++ b/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/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
index 9b93a7cca..4220993a5 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
+++ b/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/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
index 5c9d9a309..e019837d7 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
+++ b/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/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
index 42360d6ed..09070e2c0 100644
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
+++ b/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
 {