diff --git a/tests/compiler/stdlib/array-accessible-countable-iterable.phpt b/tests/aot/compiler/array-accessible-countable-iterable.phpt
similarity index 100%
rename from tests/compiler/stdlib/array-accessible-countable-iterable.phpt
rename to tests/aot/compiler/array-accessible-countable-iterable.phpt
diff --git a/tests/compiler/array/array-diff-key-strict-dominators.phpt b/tests/aot/compiler/array-diff-key-strict-dominators.phpt
similarity index 100%
rename from tests/compiler/array/array-diff-key-strict-dominators.phpt
rename to tests/aot/compiler/array-diff-key-strict-dominators.phpt
diff --git a/tests/compiler/array/array-filter-keys-strict.phpt b/tests/aot/compiler/array-filter-keys-strict.phpt
similarity index 100%
rename from tests/compiler/array/array-filter-keys-strict.phpt
rename to tests/aot/compiler/array-filter-keys-strict.phpt
diff --git a/tests/compiler/array/array-keys-range-list-check.phpt b/tests/aot/compiler/array-keys-range-list-check.phpt
similarity index 100%
rename from tests/compiler/array/array-keys-range-list-check.phpt
rename to tests/aot/compiler/array-keys-range-list-check.phpt
diff --git a/tests/compiler/functions/array-slice-reverse-preserve-keys.phpt b/tests/aot/compiler/array-slice-reverse-preserve-keys.phpt
similarity index 100%
rename from tests/compiler/functions/array-slice-reverse-preserve-keys.phpt
rename to tests/aot/compiler/array-slice-reverse-preserve-keys.phpt
diff --git a/tests/compiler/functions/array-unique-count-strict.phpt b/tests/aot/compiler/array-unique-count-strict.phpt
similarity index 100%
rename from tests/compiler/functions/array-unique-count-strict.phpt
rename to tests/aot/compiler/array-unique-count-strict.phpt
diff --git a/tests/compiler/array/array-unique-values-reindex.phpt b/tests/aot/compiler/array-unique-values-reindex.phpt
similarity index 100%
rename from tests/compiler/array/array-unique-values-reindex.phpt
rename to tests/aot/compiler/array-unique-values-reindex.phpt
diff --git a/tests/compiler/string_method/camel-to-snake-regex.phpt b/tests/aot/compiler/camel-to-snake-regex.phpt
similarity index 100%
rename from tests/compiler/string_method/camel-to-snake-regex.phpt
rename to tests/aot/compiler/camel-to-snake-regex.phpt
diff --git a/tests/compiler/functions/compiler-name-normalize.phpt b/tests/aot/compiler/compiler-name-normalize.phpt
similarity index 100%
rename from tests/compiler/functions/compiler-name-normalize.phpt
rename to tests/aot/compiler/compiler-name-normalize.phpt
diff --git a/tests/compiler/functions/cpp-signature-param-parser.phpt b/tests/aot/compiler/cpp-signature-param-parser.phpt
similarity index 100%
rename from tests/compiler/functions/cpp-signature-param-parser.phpt
rename to tests/aot/compiler/cpp-signature-param-parser.phpt
diff --git a/tests/compiler/functions/doc-comment-tags.phpt b/tests/aot/compiler/doc-comment-tags.phpt
similarity index 100%
rename from tests/compiler/functions/doc-comment-tags.phpt
rename to tests/aot/compiler/doc-comment-tags.phpt
diff --git a/tests/compiler/functions/docblock-param-regex.phpt b/tests/aot/compiler/docblock-param-regex.phpt
similarity index 100%
rename from tests/compiler/functions/docblock-param-regex.phpt
rename to tests/aot/compiler/docblock-param-regex.phpt
diff --git a/tests/compiler/class/dynamic-subclass-interface-check.phpt b/tests/aot/compiler/dynamic-subclass-interface-check.phpt
similarity index 100%
rename from tests/compiler/class/dynamic-subclass-interface-check.phpt
rename to tests/aot/compiler/dynamic-subclass-interface-check.phpt
diff --git a/tests/compiler/functions/file-extension-classifier.phpt b/tests/aot/compiler/file-extension-classifier.phpt
similarity index 100%
rename from tests/compiler/functions/file-extension-classifier.phpt
rename to tests/aot/compiler/file-extension-classifier.phpt
diff --git a/tests/compiler/functions/filter-var-ip-flags.phpt b/tests/aot/compiler/filter-var-ip-flags.phpt
similarity index 100%
rename from tests/compiler/functions/filter-var-ip-flags.phpt
rename to tests/aot/compiler/filter-var-ip-flags.phpt
diff --git a/tests/compiler/string_method/negative-string-offset.phpt b/tests/aot/compiler/negative-string-offset.phpt
similarity index 100%
rename from tests/compiler/string_method/negative-string-offset.phpt
rename to tests/aot/compiler/negative-string-offset.phpt
diff --git a/tests/compiler/type_decl/numeric-literal-classifier.phpt b/tests/aot/compiler/numeric-literal-classifier.phpt
similarity index 100%
rename from tests/compiler/type_decl/numeric-literal-classifier.phpt
rename to tests/aot/compiler/numeric-literal-classifier.phpt
diff --git a/tests/compiler/basic/preprocessor-condition-stack.phpt b/tests/aot/compiler/preprocessor-condition-stack.phpt
similarity index 100%
rename from tests/compiler/basic/preprocessor-condition-stack.phpt
rename to tests/aot/compiler/preprocessor-condition-stack.phpt
diff --git a/tests/compiler/basic/repeatable-argv-parser.phpt b/tests/aot/compiler/repeatable-argv-parser.phpt
similarity index 100%
rename from tests/compiler/basic/repeatable-argv-parser.phpt
rename to tests/aot/compiler/repeatable-argv-parser.phpt
diff --git a/tests/compiler/functions/resource-version-normalize.phpt b/tests/aot/compiler/resource-version-normalize.phpt
similarity index 100%
rename from tests/compiler/functions/resource-version-normalize.phpt
rename to tests/aot/compiler/resource-version-normalize.phpt
diff --git a/tests/compiler/basic/short-option-preprocess.phpt b/tests/aot/compiler/short-option-preprocess.phpt
similarity index 100%
rename from tests/compiler/basic/short-option-preprocess.phpt
rename to tests/aot/compiler/short-option-preprocess.phpt
diff --git a/tests/compiler/basic/target-name-normalize.phpt b/tests/aot/compiler/target-name-normalize.phpt
similarity index 100%
rename from tests/compiler/basic/target-name-normalize.phpt
rename to tests/aot/compiler/target-name-normalize.phpt
diff --git a/tests/compiler/functions/unix-link-lib-flags.phpt b/tests/aot/compiler/unix-link-lib-flags.phpt
similarity index 100%
rename from tests/compiler/functions/unix-link-lib-flags.phpt
rename to tests/aot/compiler/unix-link-lib-flags.phpt