diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp b/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
rename to test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
diff --git a/test/utilities/memory/allocator.adaptor/allocators.h b/test/utilities/allocator.adaptor/allocators.h
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/allocators.h
rename to test/utilities/allocator.adaptor/allocators.h
diff --git a/test/utilities/memory/allocator.adaptor/types.pass.cpp b/test/utilities/allocator.adaptor/types.pass.cpp
similarity index 100%
rename from test/utilities/memory/allocator.adaptor/types.pass.cpp
rename to test/utilities/allocator.adaptor/types.pass.cpp