diff --git a/tests/instance/cache/cache.txt b/tests/fixtures/instance/cache/cache.txt
similarity index 100%
rename from tests/instance/cache/cache.txt
rename to tests/fixtures/instance/cache/cache.txt
diff --git a/tests/instance/custom/instc.txt b/tests/fixtures/instance/custom/instc.txt
similarity index 100%
rename from tests/instance/custom/instc.txt
rename to tests/fixtures/instance/custom/instc.txt
diff --git a/tests/instance/custom/subcustom/instance.txt b/tests/fixtures/instance/custom/subcustom/instance.txt
similarity index 100%
rename from tests/instance/custom/subcustom/instance.txt
rename to tests/fixtures/instance/custom/subcustom/instance.txt
diff --git a/tests/instance/iinclude.php b/tests/fixtures/instance/iinclude.php
similarity index 100%
rename from tests/instance/iinclude.php
rename to tests/fixtures/instance/iinclude.php
diff --git a/tests/instance/instance_only.php b/tests/fixtures/instance/instance_only.php
similarity index 100%
rename from tests/instance/instance_only.php
rename to tests/fixtures/instance/instance_only.php
diff --git a/tests/instance/instdir/t.txt b/tests/fixtures/instance/instdir/t.txt
similarity index 100%
rename from tests/instance/instdir/t.txt
rename to tests/fixtures/instance/instdir/t.txt
diff --git a/tests/instance/manifest.php b/tests/fixtures/instance/manifest.php
similarity index 100%
rename from tests/instance/manifest.php
rename to tests/fixtures/instance/manifest.php
diff --git a/tests/instance/nowritedir/nowrite_instance.txt b/tests/fixtures/instance/nowritedir/nowrite_instance.txt
similarity index 100%
rename from tests/instance/nowritedir/nowrite_instance.txt
rename to tests/fixtures/instance/nowritedir/nowrite_instance.txt
diff --git a/tests/instance/test.php b/tests/fixtures/instance/test.php
similarity index 100%
rename from tests/instance/test.php
rename to tests/fixtures/instance/test.php
diff --git a/tests/instance/txt/ifile.txt b/tests/fixtures/instance/txt/ifile.txt
similarity index 100%
rename from tests/instance/txt/ifile.txt
rename to tests/fixtures/instance/txt/ifile.txt
diff --git a/tests/instance/txt/override.txt b/tests/fixtures/instance/txt/override.txt
similarity index 100%
rename from tests/instance/txt/override.txt
rename to tests/fixtures/instance/txt/override.txt
diff --git a/tests/instance/txt/tfile.txt b/tests/fixtures/instance/txt/tfile.txt
similarity index 100%
rename from tests/instance/txt/tfile.txt
rename to tests/fixtures/instance/txt/tfile.txt
diff --git a/tests/templatedir/custom/custom.txt b/tests/fixtures/templatedir/custom/custom.txt
similarity index 100%
rename from tests/templatedir/custom/custom.txt
rename to tests/fixtures/templatedir/custom/custom.txt
diff --git a/tests/templatedir/custom/ignore.txt b/tests/fixtures/templatedir/custom/ignore.txt
similarity index 100%
rename from tests/templatedir/custom/ignore.txt
rename to tests/fixtures/templatedir/custom/ignore.txt
diff --git a/tests/templatedir/custom/subcustom/ignore.txt b/tests/fixtures/templatedir/custom/subcustom/ignore.txt
similarity index 100%
rename from tests/templatedir/custom/subcustom/ignore.txt
rename to tests/fixtures/templatedir/custom/subcustom/ignore.txt
diff --git a/tests/templatedir/opcache-override-me.php b/tests/fixtures/templatedir/opcache-override-me.php
similarity index 100%
rename from tests/templatedir/opcache-override-me.php
rename to tests/fixtures/templatedir/opcache-override-me.php
diff --git a/tests/templatedir/template_only.php b/tests/fixtures/templatedir/template_only.php
similarity index 100%
rename from tests/templatedir/template_only.php
rename to tests/fixtures/templatedir/template_only.php
diff --git a/tests/templatedir/templdir/t.txt b/tests/fixtures/templatedir/templdir/t.txt
similarity index 100%
rename from tests/templatedir/templdir/t.txt
rename to tests/fixtures/templatedir/templdir/t.txt
diff --git a/tests/templatedir/templdir2/t.txt b/tests/fixtures/templatedir/templdir2/t.txt
similarity index 100%
rename from tests/templatedir/templdir2/t.txt
rename to tests/fixtures/templatedir/templdir2/t.txt
diff --git a/tests/templatedir/test.php b/tests/fixtures/templatedir/test.php
similarity index 100%
rename from tests/templatedir/test.php
rename to tests/fixtures/templatedir/test.php
diff --git a/tests/templatedir/tinclude.php b/tests/fixtures/templatedir/tinclude.php
similarity index 100%
rename from tests/templatedir/tinclude.php
rename to tests/fixtures/templatedir/tinclude.php
diff --git a/tests/templatedir/txt/override.txt b/tests/fixtures/templatedir/txt/override.txt
similarity index 100%
rename from tests/templatedir/txt/override.txt
rename to tests/fixtures/templatedir/txt/override.txt
diff --git a/tests/templatedir/unwritable.txt b/tests/fixtures/templatedir/unwritable.txt
similarity index 100%
rename from tests/templatedir/unwritable.txt
rename to tests/fixtures/templatedir/unwritable.txt
diff --git a/tests/glob.phpt b/tests/glob.phpt
index 7230217..3f51476 100644
--- a/tests/glob.phpt
+++ b/tests/glob.phpt
@@ -105,89 +105,9 @@ array(9) {
   [8]=>
   string(3) "txt"
 }
-array(42) {
+array(2) {
   [0]=>
-  string(4) "TODO"
-  [1]=>
-  string(10) "chgrp.phpt"
-  [2]=>
-  string(10) "chmod.phpt"
-  [3]=>
-  string(10) "chown.phpt"
-  [4]=>
-  string(8) "dir.phpt"
-  [5]=>
-  string(9) "dirs.phpt"
-  [6]=>
-  string(11) "exists.phpt"
-  [7]=>
-  string(10) "fread.phpt"
-  [8]=>
-  string(14) "getconfig.phpt"
-  [9]=>
-  string(8) "glob.php"
-  [10]=>
-  string(9) "glob.phpt"
-  [11]=>
   string(8) "instance"
-  [12]=>
-  string(16) "is_writable.phpt"
-  [13]=>
-  string(12) "maindir.phpt"
-  [14]=>
-  string(10) "mkdir.phpt"
-  [15]=>
-  string(11) "mkdir2.phpt"
-  [16]=>
-  string(11) "mkdir3.phpt"
-  [17]=>
-  string(13) "override.phpt"
-  [18]=>
-  string(19) "override_class.phpt"
-  [19]=>
-  string(9) "read.phpt"
-  [20]=>
-  string(16) "read_custom.phpt"
-  [21]=>
-  string(12) "readdir.phpt"
-  [22]=>
-  string(18) "realpath-open.phpt"
-  [23]=>
-  string(11) "rename.phpt"
-  [24]=>
-  string(12) "require.phpt"
-  [25]=>
-  string(17) "require_once.phpt"
-  [26]=>
-  string(18) "require_once2.phpt"
-  [27]=>
-  string(18) "require_once3.phpt"
-  [28]=>
-  string(25) "require_once_opcache.phpt"
-  [29]=>
-  string(9) "setup.inc"
-  [30]=>
-  string(20) "shadow_settings.phpt"
-  [31]=>
-  string(11) "stream.phpt"
-  [32]=>
+  [1]=>
   string(11) "templatedir"
-  [33]=>
-  string(10) "touch.phpt"
-  [34]=>
-  string(11) "unlink.phpt"
-  [35]=>
-  string(12) "unlink2.phpt"
-  [36]=>
-  string(17) "write-rename.phpt"
-  [37]=>
-  string(10) "write.phpt"
-  [38]=>
-  string(17) "write_custom.phpt"
-  [39]=>
-  string(14) "write_new.phpt"
-  [40]=>
-  string(15) "write_new2.phpt"
-  [41]=>
-  string(19) "write_new_mask.phpt"
 }
diff --git a/tests/mkdir3.phpt b/tests/mkdir3.phpt
index 159baf9..eb46242 100644
--- a/tests/mkdir3.phpt
+++ b/tests/mkdir3.phpt
@@ -6,7 +6,7 @@ Check creating directories when shadow is not enabled
 } ?>
 --FILE--
 <?php
-$instance = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'instance';
+$instance = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR . 'instance';
 mkdir("$instance/cache/upgrades");
 
 echo "Created\n";
diff --git a/tests/override_class.phpt b/tests/override_class.phpt
index faa9302..449fce2 100644
--- a/tests/override_class.phpt
+++ b/tests/override_class.phpt
@@ -19,15 +19,14 @@ $zip->addEmptyDir("txt/");
 $zip->addFile("txt/ifile.txt", "txt/ifile.txt");
 $zip->close();
 shadow("","");
-chdir(dirname(__FILE__));
+chdir($topdir);
 var_dump(file_exists("instance/instdir/test.zip"));
 $zip->open("instance/instdir/test.zip");
 var_dump($zip->getNameIndex(0));
 var_dump($zip->getNameIndex(1));
-unlink("instance/instdir/test.zip");
+unlink('instance/instdir/test.zip');
 ?>
 --EXPECT--
 bool(true)
 string(4) "txt/"
 string(13) "txt/ifile.txt"
-
diff --git a/tests/setup.inc b/tests/setup.inc
index 3f290a2..d050b03 100644
--- a/tests/setup.inc
+++ b/tests/setup.inc
@@ -1,5 +1,5 @@
 <?php
-$topdir = dirname(__FILE__);
+$topdir = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'fixtures';
 $template = join(DIRECTORY_SEPARATOR, [$topdir, "templatedir"]);
 $instance = join(DIRECTORY_SEPARATOR, [$topdir, "instance"]);