diff --git a/tests/aot/class-namespace.phpt b/tests/aot/namespace/class-namespace.phpt
similarity index 100%
rename from tests/aot/class-namespace.phpt
rename to tests/aot/namespace/class-namespace.phpt
diff --git a/tests/aot/ns-const.phpt b/tests/aot/namespace/ns-const.phpt
similarity index 100%
rename from tests/aot/ns-const.phpt
rename to tests/aot/namespace/ns-const.phpt
diff --git a/tests/aot/use-const.phpt b/tests/aot/namespace/use-const-alias.phpt
similarity index 100%
rename from tests/aot/use-const.phpt
rename to tests/aot/namespace/use-const-alias.phpt
diff --git a/tests/aot/universal_method_call.phpt b/tests/aot/universal_method/universal_method_call.phpt
similarity index 100%
rename from tests/aot/universal_method_call.phpt
rename to tests/aot/universal_method/universal_method_call.phpt
diff --git a/tests/aot/universal_method_expr.phpt b/tests/aot/universal_method/universal_method_expr.phpt
similarity index 100%
rename from tests/aot/universal_method_expr.phpt
rename to tests/aot/universal_method/universal_method_expr.phpt
diff --git a/tests/aot/universal_method_extension.phpt b/tests/aot/universal_method/universal_method_extension.phpt
similarity index 100%
rename from tests/aot/universal_method_extension.phpt
rename to tests/aot/universal_method/universal_method_extension.phpt
diff --git a/tests/aot/universal_method_extension_chain.phpt b/tests/aot/universal_method/universal_method_extension_chain.phpt
similarity index 100%
rename from tests/aot/universal_method_extension_chain.phpt
rename to tests/aot/universal_method/universal_method_extension_chain.phpt
diff --git a/tests/aot/universal_method_internal.phpt b/tests/aot/universal_method/universal_method_internal.phpt
similarity index 100%
rename from tests/aot/universal_method_internal.phpt
rename to tests/aot/universal_method/universal_method_internal.phpt