diff --git a/tests/compiler/compiler/negative-string-offset.phpt b/tests/compiler/basic/negative-string-offset.phpt
similarity index 100%
rename from tests/compiler/compiler/negative-string-offset.phpt
rename to tests/compiler/basic/negative-string-offset.phpt
diff --git a/tests/compiler/concat_empty.phpt b/tests/compiler/operator/concat_empty.phpt
similarity index 100%
rename from tests/compiler/concat_empty.phpt
rename to tests/compiler/operator/concat_empty.phpt
diff --git a/tests/compiler/concat_flatten.phpt b/tests/compiler/operator/concat_flatten.phpt
similarity index 100%
rename from tests/compiler/concat_flatten.phpt
rename to tests/compiler/operator/concat_flatten.phpt
diff --git a/tests/compiler/constant-int-arithmetic-overflow.phpt b/tests/compiler/operator/constant-int-arithmetic-overflow.phpt
similarity index 100%
rename from tests/compiler/constant-int-arithmetic-overflow.phpt
rename to tests/compiler/operator/constant-int-arithmetic-overflow.phpt
diff --git a/tests/compiler/constant-shift-boundaries.phpt b/tests/compiler/operator/constant-shift-boundaries.phpt
similarity index 100%
rename from tests/compiler/constant-shift-boundaries.phpt
rename to tests/compiler/operator/constant-shift-boundaries.phpt
diff --git a/tests/compiler/ternary-ref-captured.phpt b/tests/compiler/operator/ternary-ref-captured.phpt
similarity index 100%
rename from tests/compiler/ternary-ref-captured.phpt
rename to tests/compiler/operator/ternary-ref-captured.phpt
diff --git a/tests/compiler/ternary-typed-arg.phpt b/tests/compiler/operator/ternary-typed-arg.phpt
similarity index 100%
rename from tests/compiler/ternary-typed-arg.phpt
rename to tests/compiler/operator/ternary-typed-arg.phpt
diff --git a/tests/compiler/ternary-void-captured.phpt b/tests/compiler/operator/ternary-void-captured.phpt
similarity index 100%
rename from tests/compiler/ternary-void-captured.phpt
rename to tests/compiler/operator/ternary-void-captured.phpt
diff --git a/tests/compiler/compiler/array-accessible-countable-iterable.phpt b/tests/compiler/stdlib/array-accessible-countable-iterable.phpt
similarity index 100%
rename from tests/compiler/compiler/array-accessible-countable-iterable.phpt
rename to tests/compiler/stdlib/array-accessible-countable-iterable.phpt
diff --git a/tests/compiler/compiler/array-diff-key-strict-dominators.phpt b/tests/compiler/stdlib/array-diff-key-strict-dominators.phpt
similarity index 100%
rename from tests/compiler/compiler/array-diff-key-strict-dominators.phpt
rename to tests/compiler/stdlib/array-diff-key-strict-dominators.phpt
diff --git a/tests/compiler/compiler/array-filter-keys-strict.phpt b/tests/compiler/stdlib/array-filter-keys-strict.phpt
similarity index 100%
rename from tests/compiler/compiler/array-filter-keys-strict.phpt
rename to tests/compiler/stdlib/array-filter-keys-strict.phpt
diff --git a/tests/compiler/compiler/array-keys-range-list-check.phpt b/tests/compiler/stdlib/array-keys-range-list-check.phpt
similarity index 100%
rename from tests/compiler/compiler/array-keys-range-list-check.phpt
rename to tests/compiler/stdlib/array-keys-range-list-check.phpt
diff --git a/tests/compiler/compiler/array-slice-reverse-preserve-keys.phpt b/tests/compiler/stdlib/array-slice-reverse-preserve-keys.phpt
similarity index 100%
rename from tests/compiler/compiler/array-slice-reverse-preserve-keys.phpt
rename to tests/compiler/stdlib/array-slice-reverse-preserve-keys.phpt
diff --git a/tests/compiler/compiler/array-unique-count-strict.phpt b/tests/compiler/stdlib/array-unique-count-strict.phpt
similarity index 100%
rename from tests/compiler/compiler/array-unique-count-strict.phpt
rename to tests/compiler/stdlib/array-unique-count-strict.phpt
diff --git a/tests/compiler/compiler/array-unique-values-reindex.phpt b/tests/compiler/stdlib/array-unique-values-reindex.phpt
similarity index 100%
rename from tests/compiler/compiler/array-unique-values-reindex.phpt
rename to tests/compiler/stdlib/array-unique-values-reindex.phpt
diff --git a/tests/compiler/compiler/camel-to-snake-regex.phpt b/tests/compiler/stdlib/camel-to-snake-regex.phpt
similarity index 100%
rename from tests/compiler/compiler/camel-to-snake-regex.phpt
rename to tests/compiler/stdlib/camel-to-snake-regex.phpt
diff --git a/tests/compiler/compiler/compiler-name-normalize.phpt b/tests/compiler/stdlib/compiler-name-normalize.phpt
similarity index 100%
rename from tests/compiler/compiler/compiler-name-normalize.phpt
rename to tests/compiler/stdlib/compiler-name-normalize.phpt
diff --git a/tests/compiler/compiler/cpp-signature-param-parser.phpt b/tests/compiler/stdlib/cpp-signature-param-parser.phpt
similarity index 100%
rename from tests/compiler/compiler/cpp-signature-param-parser.phpt
rename to tests/compiler/stdlib/cpp-signature-param-parser.phpt
diff --git a/tests/compiler/compiler/doc-comment-tags.phpt b/tests/compiler/stdlib/doc-comment-tags.phpt
similarity index 100%
rename from tests/compiler/compiler/doc-comment-tags.phpt
rename to tests/compiler/stdlib/doc-comment-tags.phpt
diff --git a/tests/compiler/compiler/docblock-param-regex.phpt b/tests/compiler/stdlib/docblock-param-regex.phpt
similarity index 100%
rename from tests/compiler/compiler/docblock-param-regex.phpt
rename to tests/compiler/stdlib/docblock-param-regex.phpt
diff --git a/tests/compiler/compiler/dynamic-subclass-interface-check.phpt b/tests/compiler/stdlib/dynamic-subclass-interface-check.phpt
similarity index 100%
rename from tests/compiler/compiler/dynamic-subclass-interface-check.phpt
rename to tests/compiler/stdlib/dynamic-subclass-interface-check.phpt
diff --git a/tests/compiler/compiler/file-extension-classifier.phpt b/tests/compiler/stdlib/file-extension-classifier.phpt
similarity index 100%
rename from tests/compiler/compiler/file-extension-classifier.phpt
rename to tests/compiler/stdlib/file-extension-classifier.phpt
diff --git a/tests/compiler/compiler/filter-var-ip-flags.phpt b/tests/compiler/stdlib/filter-var-ip-flags.phpt
similarity index 100%
rename from tests/compiler/compiler/filter-var-ip-flags.phpt
rename to tests/compiler/stdlib/filter-var-ip-flags.phpt
diff --git a/tests/compiler/compiler/numeric-literal-classifier.phpt b/tests/compiler/stdlib/numeric-literal-classifier.phpt
similarity index 100%
rename from tests/compiler/compiler/numeric-literal-classifier.phpt
rename to tests/compiler/stdlib/numeric-literal-classifier.phpt
diff --git a/tests/compiler/compiler/preprocessor-condition-stack.phpt b/tests/compiler/stdlib/preprocessor-condition-stack.phpt
similarity index 100%
rename from tests/compiler/compiler/preprocessor-condition-stack.phpt
rename to tests/compiler/stdlib/preprocessor-condition-stack.phpt
diff --git a/tests/compiler/compiler/repeatable-argv-parser.phpt b/tests/compiler/stdlib/repeatable-argv-parser.phpt
similarity index 100%
rename from tests/compiler/compiler/repeatable-argv-parser.phpt
rename to tests/compiler/stdlib/repeatable-argv-parser.phpt
diff --git a/tests/compiler/compiler/resource-version-normalize.phpt b/tests/compiler/stdlib/resource-version-normalize.phpt
similarity index 100%
rename from tests/compiler/compiler/resource-version-normalize.phpt
rename to tests/compiler/stdlib/resource-version-normalize.phpt
diff --git a/tests/compiler/compiler/short-option-preprocess.phpt b/tests/compiler/stdlib/short-option-preprocess.phpt
similarity index 100%
rename from tests/compiler/compiler/short-option-preprocess.phpt
rename to tests/compiler/stdlib/short-option-preprocess.phpt
diff --git a/tests/compiler/compiler/target-name-normalize.phpt b/tests/compiler/stdlib/target-name-normalize.phpt
similarity index 100%
rename from tests/compiler/compiler/target-name-normalize.phpt
rename to tests/compiler/stdlib/target-name-normalize.phpt
diff --git a/tests/compiler/compiler/unix-link-lib-flags.phpt b/tests/compiler/stdlib/unix-link-lib-flags.phpt
similarity index 100%
rename from tests/compiler/compiler/unix-link-lib-flags.phpt
rename to tests/compiler/stdlib/unix-link-lib-flags.phpt
diff --git a/tests/compiler/scalar-alias-class-type-names.phpt b/tests/compiler/type_decl/scalar-alias-class-type-names.phpt
similarity index 100%
rename from tests/compiler/scalar-alias-class-type-names.phpt
rename to tests/compiler/type_decl/scalar-alias-class-type-names.phpt