diff --git a/ext/standard/tests/file/file_get_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_basic.phpt
index 5c060fdae1ba5..bdd2133146d54 100644
--- a/ext/standard/tests/file/file_get_contents_basic.phpt
+++ b/ext/standard/tests/file/file_get_contents_basic.phpt
@@ -21,10 +21,15 @@ echo "\n-- Testing with empty file --\n";
 
 create_files($file_path, 1, "empty", 0755, 100, "w", "file", 1, "byte");
 var_dump( file_get_contents($file_path."/file1.tmp") );
-delete_files($file_path, 1);
 
 echo "\n*** Done ***";
 ?>
+--CLEAN--
+<?php
+$file_path = __DIR__;
+include($file_path."/file.inc");
+delete_files($file_path, 1);
+?>
 --EXPECT--
 *** Testing the basic functionality of the file_get_contents() function ***
 -- Testing with simple valid data file --
diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt
index e770626054589..1327a65fc605a 100644
--- a/ext/standard/tests/file/file_get_contents_variation1.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation1.phpt
@@ -23,7 +23,6 @@ set_include_path($newpath);
 runtest();
 teardown_include_path();
 chdir("..");
-rmdir($thisTestDir);
 
 
 function runtest() {
@@ -36,6 +35,12 @@ function runtest() {
    unlink($secondFile);
 }
 
+?>
+--CLEAN--
+<?php
+// TODO Clean up tmp files
+$thisTestDir = "fileGetContentsVar1.dir";
+rmdir($thisTestDir);
 ?>
 --EXPECT--
 *** Testing file_get_contents() : variation ***
diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt
index db3fd365c2b93..56b148ebdbccb 100644
--- a/ext/standard/tests/file/file_get_contents_variation2.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation2.phpt
@@ -24,7 +24,6 @@ set_include_path($newpath);
 runtest();
 teardown_include_path();
 chdir("..");
-rmdir($thisTestDir);
 
 
 function runtest() {
@@ -37,6 +36,12 @@ function runtest() {
    unlink($scriptLocFile);
 }
 
+?>
+--CLEAN--
+<?php
+$thisTestDir = "FileGetContentsVar2.dir";
+// TODO Clean up tmp files?
+rmdir($thisTestDir);
 ?>
 --EXPECT--
 *** Testing file_get_contents() : variation ***
diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
index c1a0b1960ae75..5dfa6227bccf0 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
@@ -54,13 +54,22 @@ for($i = 0; $i<count($allDirs); $i++) {
   var_dump(file_get_contents($dir."\\".$filename));
 }
 
-unlink($absFile);
 chdir($old_dir_path);
-rmdir($absSubDir);
-rmdir($absMainDir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$mainDir = "fileGetContentsVar7私はガラスを食べられます.dir";
+$subDir = "fileGetContentsVar7Sub私はガラスを食べられます";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
+unlink($absFile);
+rmdir($absSubDir);
+rmdir($absMainDir);
+?>
 --EXPECTF--
 *** Testing file_get_contents() : variation ***
 
diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
index a18af0ff11199..a353630c95326 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
@@ -54,13 +54,22 @@ for($i = 0; $i<count($allDirs); $i++) {
   var_dump(file_get_contents($dir."\\".$filename));
 }
 
-unlink($absFile);
 chdir($old_dir_path);
-rmdir($absSubDir);
-rmdir($absMainDir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$mainDir = "fileGetContentsVar7.dir";
+$subDir = "fileGetContentsVar7Sub";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
+unlink($absFile);
+rmdir($absSubDir);
+rmdir($absMainDir);
+?>
 --EXPECTF--
 *** Testing file_get_contents() : variation ***
 
diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt
index 6af0aaba714c1..2d574c6410b07 100644
--- a/ext/standard/tests/file/file_get_contents_variation7.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7.phpt
@@ -47,11 +47,20 @@ for($i = 0; $i<count($allDirs); $i++) {
 }
 
 chdir($old_dir_path);
+
+echo "\n*** Done ***\n";
+?>
+--CLEAN--
+<?php
+$mainDir = "fileGetContentsVar7.dir";
+$subDir = "fileGetContentsVar7Sub";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
 unlink($absFile);
 rmdir($absSubDir);
 rmdir($absMainDir);
-
-echo "\n*** Done ***\n";
 ?>
 --EXPECTF--
 *** Testing file_get_contents() : variation ***
diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt
index 67ec4b3d2a5a7..a113fcb06f580 100644
--- a/ext/standard/tests/file/file_get_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation9.phpt
@@ -33,12 +33,18 @@ var_dump(file_get_contents($chainlink));
 var_dump(file_get_contents($softlink));
 var_dump(file_get_contents($hardlink));
 
+echo "\n*** Done ***\n";
+?>
+--CLEAN--
+<?php
+$filename = __DIR__.'/fileGetContentsVar9.tmp';
+$softlink = __DIR__.'/fileGetContentsVar9.SoftLink';
+$hardlink = __DIR__.'/fileGetContentsVar9.HardLink';
+$chainlink = __DIR__.'/fileGetContentsVar9.ChainLink';
 unlink($chainlink);
 unlink($softlink);
 unlink($hardlink);
 unlink($filename);
-
-echo "\n*** Done ***\n";
 ?>
 --EXPECT--
 *** Testing file_get_contents() : variation ***
diff --git a/ext/standard/tests/file/file_put_contents.phpt b/ext/standard/tests/file/file_put_contents.phpt
index f9dc6d1b8edd0..97094e92d0eff 100644
--- a/ext/standard/tests/file/file_put_contents.phpt
+++ b/ext/standard/tests/file/file_put_contents.phpt
@@ -25,10 +25,13 @@ try {
     echo $e->getMessage(), "\n";
 }
 
-@unlink($file);
-
 echo "Done\n";
 ?>
+--CLEAN--
+<?php
+$file = __DIR__."/file_put_contents.txt";
+unlink($file);
+?>
 --EXPECT--
 file_put_contents(): supplied resource is not a valid stream resource
 bool(false)
diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt
index c67b2e234b0b8..bd32f4d7ffb6e 100644
--- a/ext/standard/tests/file/file_put_contents_variation1.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation1.phpt
@@ -21,9 +21,13 @@ file_put_contents($filename, $data);
 echo filesize($filename)."\n";
 readfile($filename);
 echo "\n";
-unlink($filename);
 
 
+?>
+--CLEAN--
+<?php
+$filename = "FilePutContentsVar1.tmp";
+unlink($filename);
 ?>
 --EXPECT--
 *** Testing file_put_contents() : variation ***
diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt
index a0c73eca40f15..3d41a1f3c1900 100644
--- a/ext/standard/tests/file/file_put_contents_variation2.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation2.phpt
@@ -100,8 +100,12 @@ foreach($inputs as $key =>$value) {
       file_put_contents($filename, $value);
       readfile($filename);
 };
-unlink($filename);
 
+?>
+--CLEAN--
+<?php
+$filename = __DIR__ . '/fwriteVar5.tmp';
+unlink($filename);
 ?>
 --EXPECT--
 *** Testing file_put_contents() : usage variation ***
diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt
index 4244062b322bc..0fef561a70725 100644
--- a/ext/standard/tests/file/file_put_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation4.phpt
@@ -22,8 +22,6 @@ runtest();
 
 teardown_include_path();
 chdir("..");
-rmdir($thisTestDir);
-
 
 function runtest() {
    global $filename;
@@ -35,6 +33,13 @@ function runtest() {
    unlink($filename);
 }
 
+?>
+--CLEAN--
+<?php
+$thisTestDir = basename(__FILE__, ".clean.php") . ".dir";
+$filename = basename(__FILE__, ".clean.php") . ".tmp";
+@unlink($filename);
+rmdir($thisTestDir);
 ?>
 --EXPECT--
 File in include path
diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt
index 97eb2604e02a5..0bc3d325aff4e 100644
--- a/ext/standard/tests/file/file_put_contents_variation5.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation5.phpt
@@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 <?php
 
 
-$thisTestDir = __DIR__ . '/' .basename(__FILE__, ".php") . ".directory";
+$thisTestDir = __DIR__ . '/' .basename(__FILE__, ".php") . ".dir";
 mkdir($thisTestDir);
 chdir($thisTestDir);
 
@@ -25,7 +25,6 @@ set_include_path(";;  ; ;c:\\rubbish");
 runtest();
 
 chdir(__DIR__);
-rmdir($thisTestDir);
 
 
 function runtest() {
@@ -41,6 +40,15 @@ function runtest() {
    }
 }
 ?>
+--CLEAN--
+<?php
+$thisTestDir = __DIR__ . '/' . basename(__FILE__, ".clean.php") . ".dir";
+$filename = basename(__FILE__, ".clean.php") . ".tmp";
+$scriptLocFile = __DIR__."/".$filename;
+@unlink($filename);
+@unlink($scriptLocFile);
+rmdir($thisTestDir);
+?>
 --EXPECT--
 File written in working directory
 File written in working directory
diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt
index fbe4cdfa6155e..06962340c8392 100644
--- a/ext/standard/tests/file/file_put_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation6.phpt
@@ -24,7 +24,6 @@ runtest();
 
 teardown_include_path();
 chdir("..");
-rmdir($thisTestDir);
 
 
 function runtest() {
@@ -40,6 +39,13 @@ function runtest() {
    unlink($filename);
 }
 
+?>
+--CLEAN--
+<?php
+$thisTestDir = basename(__FILE__, ".clean.php") . ".dir";
+$filename = basename(__FILE__, ".clean.php") . ".tmp";
+@unlink($filename);
+rmdir($thisTestDir);
 ?>
 --EXPECT--
 *** Testing file_put_contents() : variation ***
diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
index 38e322398dac6..fe9796979d131 100644
--- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
@@ -71,11 +71,21 @@ for($i = 0; $i<count($allDirs); $i++) {
 }
 
 chdir($old_dir_path);
-rmdir($absSubDir);
-rmdir($absMainDir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$mainDir = "filePutContentsVar7.dir";
+$subDir = "filePutContentsVar7Sub";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
+@unlink($absFile);
+rmdir($absSubDir);
+rmdir($absMainDir);
+?>
 --EXPECTF--
 *** Testing file_put_contents() : usage variation ***
 
diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt
index 6e380dc4f653e..4e3d2e766f4dc 100644
--- a/ext/standard/tests/file/file_put_contents_variation7.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation7.phpt
@@ -63,11 +63,21 @@ for($i = 0; $i<count($allDirs); $i++) {
 }
 
 chdir($old_dir_path);
-rmdir($absSubDir);
-rmdir($absMainDir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$mainDir = "filePutContentsVar7.dir";
+$subDir = "filePutContentsVar7Sub";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
+@unlink($absFile);
+rmdir($absSubDir);
+rmdir($absMainDir);
+?>
 --EXPECTF--
 *** Testing file_put_contents() : usage variation ***
 
diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt
index 70456fad9ff7d..705efcade7bf3 100644
--- a/ext/standard/tests/file/file_put_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8.phpt
@@ -48,10 +48,15 @@ for( $i=0; $i<count($names_arr); $i++ ) {
         echo get_class($e) . ': ' . $e->getMessage(), "\n";
     }
 }
-rmdir($dir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$dir = __DIR__ . '/file_put_contents_variation8';
+// TODO Cleanup temp files?
+rmdir($dir);
+?>
 --EXPECTF--
 *** Testing file_put_contents() : usage variation ***
 -- Iteration 0 --
diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt
index 03b72d178f45d..cc0303075009b 100644
--- a/ext/standard/tests/file/file_put_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation9.phpt
@@ -31,12 +31,6 @@ file_put_contents($filename,"");
 link($filename, $hardlink);
 run_test($hardlink);
 
-unlink($chainlink);
-unlink($softlink);
-unlink($hardlink);
-unlink($filename);
-
-
 function run_test($file) {
     $data = "Here is some data";
     $extra = ", more data";
@@ -49,6 +43,17 @@ function run_test($file) {
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$filename = __DIR__.'/filePutContentsVar9.tmp';
+$softlink = __DIR__.'/filePutContentsVar9.SoftLink';
+$hardlink = __DIR__.'/filePutContentsVar9.HardLink';
+$chainlink = __DIR__.'/filePutContentsVar9.ChainLink';
+unlink($chainlink);
+unlink($softlink);
+unlink($hardlink);
+unlink($filename);
+?>
 --EXPECT--
 *** Testing file_put_contents() : usage variation ***
 int(17)
diff --git a/ext/standard/tests/file/file_variation5-win32-mb.phpt b/ext/standard/tests/file/file_variation5-win32-mb.phpt
index ff7c5648db03f..b997ae5860cd4 100644
--- a/ext/standard/tests/file/file_variation5-win32-mb.phpt
+++ b/ext/standard/tests/file/file_variation5-win32-mb.phpt
@@ -14,7 +14,7 @@ chdir($script_directory);
 $test_dirname = basename(__FILE__, ".php") . "私はガラスを食べられますtestdir";
 mkdir($test_dirname);
 
-$filepath = __FILE__ . ".tmp";
+$filepath = __DIR__ . '/file_variation_5.tmp';
 $filename = basename($filepath);
 $fd = fopen($filepath, "w+");
 fwrite($fd, "Line 1\nLine 2\nLine 3");
@@ -31,10 +31,13 @@ chdir($test_dirname);
 var_dump(file("../$filename"));
 chdir($script_directory);
 
-chdir($script_directory);
-unlink($filepath);
+?>
+--CLEAN--
+<?php
+$test_dirname = basename(__FILE__, ".clean.php") . "私はガラスを食べられますtestdir";
+$filepath = __DIR__ . '/file_variation_5.tmp';
 rmdir($test_dirname);
-
+unlink($filepath);
 ?>
 --EXPECT--
 file() on a path containing .. and .
diff --git a/ext/standard/tests/file/file_variation5-win32.phpt b/ext/standard/tests/file/file_variation5-win32.phpt
index f31f3c769a627..f4ba7fe732f3d 100644
--- a/ext/standard/tests/file/file_variation5-win32.phpt
+++ b/ext/standard/tests/file/file_variation5-win32.phpt
@@ -14,7 +14,7 @@ chdir($script_directory);
 $test_dirname = basename(__FILE__, ".php") . "testdir";
 mkdir($test_dirname);
 
-$filepath = __FILE__ . ".tmp";
+$filepath = __DIR__ . '/file_variation_5.tmp';
 $filename = basename($filepath);
 $fd = fopen($filepath, "w+");
 fwrite($fd, "Line 1\nLine 2\nLine 3");
@@ -31,10 +31,13 @@ chdir($test_dirname);
 var_dump(file("../$filename"));
 chdir($script_directory);
 
-chdir($script_directory);
+?>
+--CLEAN--
+<?php
+$test_dirname = basename(__FILE__, ".clean.php") . "testdir";
+$filepath = __DIR__ . '/file_variation_5.tmp';
 rmdir($test_dirname);
 unlink($filepath);
-
 ?>
 --EXPECT--
 file() on a path containing .. and .
diff --git a/ext/standard/tests/file/file_variation5.phpt b/ext/standard/tests/file/file_variation5.phpt
index 7f012b7d431ec..d1c5e1498bebd 100644
--- a/ext/standard/tests/file/file_variation5.phpt
+++ b/ext/standard/tests/file/file_variation5.phpt
@@ -14,7 +14,7 @@ chdir($script_directory);
 $test_dirname = basename(__FILE__, ".php") . "testdir";
 mkdir($test_dirname);
 
-$filepath = __FILE__ . ".tmp";
+$filepath = __DIR__ . '/file_variation_5.tmp';
 $filename = basename($filepath);
 $fd = fopen($filepath, "w+");
 fwrite($fd, "Line 1\nLine 2\nLine 3");
@@ -37,10 +37,13 @@ chdir($test_dirname);
 var_dump(file("../$filename"));
 chdir($script_directory);
 
-chdir($script_directory);
+?>
+--CLEAN--
+<?php
+$test_dirname = __DIR__ . '/' . basename(__FILE__, ".clean.php") . "testdir";
+$filepath = __DIR__ . '/file_variation_5.tmp';
+@unlink($filepath); // Should be delete via the symlink deletion
 rmdir($test_dirname);
-unlink($filepath);
-
 ?>
 --EXPECT--
 file() on a path containing .. and .
diff --git a/ext/standard/tests/file/file_variation6.phpt b/ext/standard/tests/file/file_variation6.phpt
index 354f6ee509c7b..6444c7f366757 100644
--- a/ext/standard/tests/file/file_variation6.phpt
+++ b/ext/standard/tests/file/file_variation6.phpt
@@ -3,7 +3,7 @@ file() with a range of integer flag values
 --FILE--
 <?php
 
-$filepath = __FILE__ . ".tmp";
+$filepath = __DIR__ . '/file_variation_6.tmp';
 $fd = fopen($filepath, "w+");
 fwrite($fd, "Line 1\nLine 2\nLine 3");
 fclose($fd);
@@ -16,8 +16,11 @@ for ($flags = 0; $flags <= 32; $flags++) {
     }
 }
 
+?>
+--CLEAN--
+<?php
+$filepath = __DIR__ . '/file_variation_6.tmp';
 unlink($filepath);
-
 ?>
 --EXPECT--
 array(3) {
diff --git a/ext/standard/tests/file/file_variation7.phpt b/ext/standard/tests/file/file_variation7.phpt
index 3cd9d7fc88518..72af244a54e17 100644
--- a/ext/standard/tests/file/file_variation7.phpt
+++ b/ext/standard/tests/file/file_variation7.phpt
@@ -1,9 +1,10 @@
 --TEST--
 file() on a file with blank lines
+--WHITESPACE_SENSITIVE--
 --FILE--
 <?php
 
-$filepath = __FILE__ . ".tmp";
+$filepath = __DIR__ . '/file_variation_7.tmp';
 $fd = fopen($filepath, "w+");
 fwrite($fd, "Line 1\n\n \n  \n\Line 3");
 fclose($fd);
@@ -20,8 +21,12 @@ var_dump(file($filepath, FILE_SKIP_EMPTY_LINES));
 echo "\nfile() with FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES:\n";
 var_dump(file($filepath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES));
 
-unlink($filepath);
 
+?>
+--CLEAN--
+<?php
+$filepath = __DIR__ . '/file_variation_7.tmp';
+unlink($filepath);
 ?>
 --EXPECT--
 file():
diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt
index 511bc0eb7cd0f..9df2f5e4c536b 100644
--- a/ext/standard/tests/file/file_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_variation8-win32.phpt
@@ -54,13 +54,22 @@ for($i = 0; $i<count($allDirs); $i++) {
   var_dump(file($dir."\\".$filename));
 }
 
-unlink($absFile);
 chdir($old_dir_path);
-rmdir($absSubDir);
-rmdir($absMainDir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$mainDir = "fileVar8.dir";
+$subDir = "fileVar8Sub";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
+unlink($absFile);
+rmdir($absSubDir);
+rmdir($absMainDir);
+?>
 --EXPECTF--
 *** Testing file() : variation ***
 
diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt
index f42925043dcae..8c79a3bb4f48f 100644
--- a/ext/standard/tests/file/file_variation8.phpt
+++ b/ext/standard/tests/file/file_variation8.phpt
@@ -46,13 +46,22 @@ for($i = 0; $i<count($allDirs); $i++) {
   var_dump(file($dir."/".$filename));
 }
 
-unlink($absFile);
 chdir($old_dir_path);
-rmdir($absSubDir);
-rmdir($absMainDir);
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$mainDir = "fileVar8.dir";
+$subDir = "fileVar8Sub";
+$absMainDir = __DIR__."/".$mainDir;
+$absSubDir = $absMainDir."/".$subDir;
+$filename = 'FileGetContentsVar7.tmp';
+$absFile = $absSubDir.'/'.$filename;
+unlink($absFile);
+rmdir($absSubDir);
+rmdir($absMainDir);
+?>
 --EXPECTF--
 *** Testing file() : variation ***
 
diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt
index 326a56ca27de0..db18e9cc05eb5 100644
--- a/ext/standard/tests/file/file_variation9.phpt
+++ b/ext/standard/tests/file/file_variation9.phpt
@@ -15,7 +15,6 @@ $contents = array(
    "File has\r\nmultiple crlfs\n\r\n"
    );
 
-@unlink($testfile);
 foreach ($contents as $content) {
     $h = fopen($testfile, "w");
     fwrite($h, $content);
@@ -26,6 +25,11 @@ foreach ($contents as $content) {
 
 echo "\n*** Done ***\n";
 ?>
+--CLEAN--
+<?php
+$testfile = __DIR__."/fileVar9.txt";
+@unlink($testfile);
+?>
 --EXPECT--
 *** Testing file() : variation ***
 array(2) {