diff --git a/tests/aot/basic/magic-constants.phpt b/tests/aot/basic/magic-constants.phpt
index 4eb02b1c..7767715b 100644
--- a/tests/aot/basic/magic-constants.phpt
+++ b/tests/aot/basic/magic-constants.phpt
@@ -30,7 +30,7 @@ function main() {
 --EXPECTF--
 __LINE__: int(%d)
 __FILE__: string(%d) "magic-constants.php"
-__DIR__: string(%d) "aot"
+__DIR__: string(%d) "basic"
 __FUNCTION__ in function: string(%d) "testFunction"
 __METHOD__: string(%d) "TestMagicConst::testMethod"
 __CLASS__: string(%d) "TestMagicConst"
diff --git a/tests/aot/test_include.inc b/tests/aot/basic/test_include.inc
similarity index 100%
rename from tests/aot/test_include.inc
rename to tests/aot/basic/test_include.inc
diff --git a/tests/aot/empty/empty-test.phpt b/tests/aot/empty/empty-test.phpt
index c222c0dd..84a03e68 100644
--- a/tests/aot/empty/empty-test.phpt
+++ b/tests/aot/empty/empty-test.phpt
@@ -2,7 +2,7 @@
 empty (linked expr)
 --FILE--
 <?php
-include __DIR__ . '/static_property_test.inc';
+include __DIR__ . '/../static_property_test.inc';
 $arr = array(
     array(2, 2)
 );
diff --git a/tests/aot/empty/isset-test.phpt b/tests/aot/empty/isset-test.phpt
index dadf5b13..9a0eb773 100644
--- a/tests/aot/empty/isset-test.phpt
+++ b/tests/aot/empty/isset-test.phpt
@@ -2,7 +2,7 @@
 isset (linked expr)
 --FILE--
 <?php
-include __DIR__ . '/static_property_test.inc';
+include __DIR__ . '/../static_property_test.inc';
 $arr = array(
     array(2, 2)
 );
diff --git a/tests/aot/ref/ref-call-arg.phpt b/tests/aot/ref/ref-call-arg.phpt
index e1b7f65a..07f3e9da 100644
--- a/tests/aot/ref/ref-call-arg.phpt
+++ b/tests/aot/ref/ref-call-arg.phpt
@@ -5,7 +5,7 @@ ref call arg
 function main()
 {
     $zip = new ZipArchive();
-    $path = realpath(__DIR__ . '/../../../data/test.zip');
+    $path = realpath(__DIR__ . '/../../../../data/test.zip');
     if ($zip->open($path) === TRUE) {
         for ($idx = 0; $s = $zip->statIndex($idx); $idx++) {
             $rs = $zip->getExternalAttributesIndex($idx, $opsys, $attr);
diff --git a/tests/aot/static/static_class_property_read_write.phpt b/tests/aot/static/static_class_property_read_write.phpt
index 0666fec7..3e7bf6e0 100644
--- a/tests/aot/static/static_class_property_read_write.phpt
+++ b/tests/aot/static/static_class_property_read_write.phpt
@@ -3,7 +3,7 @@ Static Class Property Read/Write Test
 --FILE--
 <?php
 
-include __DIR__ . '/static_property_test.inc';
+include __DIR__ . '/../static_property_test.inc';
 
 // Test reading static properties
 echo "Initial public property: " . TestClass::$public_static_property . "\n";
diff --git a/tests/aot/universal_method/universal_method_expr.phpt b/tests/aot/universal_method/universal_method_expr.phpt
index 37793771..efe62c81 100644
--- a/tests/aot/universal_method/universal_method_expr.phpt
+++ b/tests/aot/universal_method/universal_method_expr.phpt
@@ -51,7 +51,7 @@ class Helper {
 
 function main()
 {
-    require __DIR__ . '/../../src/Assert.php';
+    require __DIR__ . '/../../../src/Assert.php';
 
     // --- Test 1: FuncCall -> universal method ---
     Assert::eq(getString()->length(), 11);