diff --git a/tests/aot/basic/preprocessor-condition-stack.phpt b/tests/compiler/basic/preprocessor-condition-stack.phpt
similarity index 100%
rename from tests/aot/basic/preprocessor-condition-stack.phpt
rename to tests/compiler/basic/preprocessor-condition-stack.phpt
diff --git a/tests/aot/basic/short-option-preprocess.phpt b/tests/compiler/basic/short-option-preprocess.phpt
similarity index 100%
rename from tests/aot/basic/short-option-preprocess.phpt
rename to tests/compiler/basic/short-option-preprocess.phpt
diff --git a/tests/aot/basic/target-name-normalize.phpt b/tests/compiler/basic/target-name-normalize.phpt
similarity index 100%
rename from tests/aot/basic/target-name-normalize.phpt
rename to tests/compiler/basic/target-name-normalize.phpt
diff --git a/tests/aot/functions/compiler-name-normalize.phpt b/tests/compiler/functions/compiler-name-normalize.phpt
similarity index 100%
rename from tests/aot/functions/compiler-name-normalize.phpt
rename to tests/compiler/functions/compiler-name-normalize.phpt
diff --git a/tests/aot/functions/cpp-signature-param-parser.phpt b/tests/compiler/functions/cpp-signature-param-parser.phpt
similarity index 100%
rename from tests/aot/functions/cpp-signature-param-parser.phpt
rename to tests/compiler/functions/cpp-signature-param-parser.phpt
diff --git a/tests/aot/functions/doc-comment-tags.phpt b/tests/compiler/functions/doc-comment-tags.phpt
similarity index 100%
rename from tests/aot/functions/doc-comment-tags.phpt
rename to tests/compiler/functions/doc-comment-tags.phpt
diff --git a/tests/aot/functions/docblock-param-regex.phpt b/tests/compiler/functions/docblock-param-regex.phpt
similarity index 100%
rename from tests/aot/functions/docblock-param-regex.phpt
rename to tests/compiler/functions/docblock-param-regex.phpt
diff --git a/tests/aot/functions/file-extension-classifier.phpt b/tests/compiler/functions/file-extension-classifier.phpt
similarity index 100%
rename from tests/aot/functions/file-extension-classifier.phpt
rename to tests/compiler/functions/file-extension-classifier.phpt
diff --git a/tests/aot/functions/resource-version-normalize.phpt b/tests/compiler/functions/resource-version-normalize.phpt
similarity index 100%
rename from tests/aot/functions/resource-version-normalize.phpt
rename to tests/compiler/functions/resource-version-normalize.phpt
diff --git a/tests/aot/functions/unix-link-lib-flags.phpt b/tests/compiler/functions/unix-link-lib-flags.phpt
similarity index 100%
rename from tests/aot/functions/unix-link-lib-flags.phpt
rename to tests/compiler/functions/unix-link-lib-flags.phpt
diff --git a/tests/aot/string_method/camel-to-snake-regex.phpt b/tests/compiler/string_method/camel-to-snake-regex.phpt
similarity index 100%
rename from tests/aot/string_method/camel-to-snake-regex.phpt
rename to tests/compiler/string_method/camel-to-snake-regex.phpt
diff --git a/tests/aot/string_method/negative-string-offset.phpt b/tests/compiler/string_method/negative-string-offset.phpt
similarity index 100%
rename from tests/aot/string_method/negative-string-offset.phpt
rename to tests/compiler/string_method/negative-string-offset.phpt
diff --git a/tests/aot/type_decl/numeric-literal-classifier.phpt b/tests/compiler/type_decl/numeric-literal-classifier.phpt
similarity index 100%
rename from tests/aot/type_decl/numeric-literal-classifier.phpt
rename to tests/compiler/type_decl/numeric-literal-classifier.phpt