diff --git a/tests/aot/array/array-diff-key-strict-dominators.phpt b/tests/compiler/array/array-diff-key-strict-dominators.phpt
similarity index 100%
rename from tests/aot/array/array-diff-key-strict-dominators.phpt
rename to tests/compiler/array/array-diff-key-strict-dominators.phpt
diff --git a/tests/aot/array/array-filter-keys-strict.phpt b/tests/compiler/array/array-filter-keys-strict.phpt
similarity index 100%
rename from tests/aot/array/array-filter-keys-strict.phpt
rename to tests/compiler/array/array-filter-keys-strict.phpt
diff --git a/tests/aot/array/array-keys-range-list-check.phpt b/tests/compiler/array/array-keys-range-list-check.phpt
similarity index 100%
rename from tests/aot/array/array-keys-range-list-check.phpt
rename to tests/compiler/array/array-keys-range-list-check.phpt
diff --git a/tests/aot/array/array-unique-values-reindex.phpt b/tests/compiler/array/array-unique-values-reindex.phpt
similarity index 100%
rename from tests/aot/array/array-unique-values-reindex.phpt
rename to tests/compiler/array/array-unique-values-reindex.phpt
diff --git a/tests/aot/basic/repeatable-argv-parser.phpt b/tests/compiler/basic/repeatable-argv-parser.phpt
similarity index 100%
rename from tests/aot/basic/repeatable-argv-parser.phpt
rename to tests/compiler/basic/repeatable-argv-parser.phpt
diff --git a/tests/aot/class/dynamic-subclass-interface-check.phpt b/tests/compiler/class/dynamic-subclass-interface-check.phpt
similarity index 100%
rename from tests/aot/class/dynamic-subclass-interface-check.phpt
rename to tests/compiler/class/dynamic-subclass-interface-check.phpt
diff --git a/tests/aot/functions/array-slice-reverse-preserve-keys.phpt b/tests/compiler/functions/array-slice-reverse-preserve-keys.phpt
similarity index 100%
rename from tests/aot/functions/array-slice-reverse-preserve-keys.phpt
rename to tests/compiler/functions/array-slice-reverse-preserve-keys.phpt
diff --git a/tests/aot/functions/array-unique-count-strict.phpt b/tests/compiler/functions/array-unique-count-strict.phpt
similarity index 100%
rename from tests/aot/functions/array-unique-count-strict.phpt
rename to tests/compiler/functions/array-unique-count-strict.phpt
diff --git a/tests/aot/functions/filter-var-ip-flags.phpt b/tests/compiler/functions/filter-var-ip-flags.phpt
similarity index 100%
rename from tests/aot/functions/filter-var-ip-flags.phpt
rename to tests/compiler/functions/filter-var-ip-flags.phpt
diff --git a/tests/aot/stdlib/array-accessible-countable-iterable.phpt b/tests/compiler/stdlib/array-accessible-countable-iterable.phpt
similarity index 100%
rename from tests/aot/stdlib/array-accessible-countable-iterable.phpt
rename to tests/compiler/stdlib/array-accessible-countable-iterable.phpt