diff --git a/test/utilities/function.objects/base/nothing_to_do.pass.cpp b/test/depr/depr.function.objects/depr.base/nothing_to_do.pass.cpp similarity index 100% rename from test/utilities/function.objects/base/nothing_to_do.pass.cpp rename to test/depr/depr.function.objects/depr.base/nothing_to_do.pass.cpp diff --git a/test/utilities/meta/meta.unary/meta.unary.prop/alignment_of.pass.cpp b/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp similarity index 100% rename from test/utilities/meta/meta.unary/meta.unary.prop/alignment_of.pass.cpp rename to test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp diff --git a/test/utilities/meta/meta.unary/meta.unary.prop/extent.pass.cpp b/test/utilities/meta/meta.unary.prop.query/extent.pass.cpp similarity index 100% rename from test/utilities/meta/meta.unary/meta.unary.prop/extent.pass.cpp rename to test/utilities/meta/meta.unary.prop.query/extent.pass.cpp diff --git a/test/utilities/meta/meta.unary/meta.unary.prop/rank.pass.cpp b/test/utilities/meta/meta.unary.prop.query/rank.pass.cpp similarity index 100% rename from test/utilities/meta/meta.unary/meta.unary.prop/rank.pass.cpp rename to test/utilities/meta/meta.unary.prop.query/rank.pass.cpp