diff --git a/ext/com_dotnet/tests/bug78650.phpt b/ext/com_dotnet/tests/bug78650.phpt
index ca2a235af24..3474a599e11 100644
--- a/ext/com_dotnet/tests/bug78650.phpt
+++ b/ext/com_dotnet/tests/bug78650.phpt
@@ -17,9 +17,9 @@ print('OK');
 OK
 --CLEAN--
 <?php
+@rmdir(__DIR__ . '/bug78650/foo/bar');
+@rmdir(__DIR__ . '/bug78650/foo');
 rmdir(__DIR__ . '/bug78650/baz/bar');
-rmdir(__DIR__ . '/bug78650/foo/bar');
 rmdir(__DIR__ . '/bug78650/baz');
-rmdir(__DIR__ . '/bug78650/foo');
 rmdir(__DIR__ . '/bug78650');
 ?>
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
index eaaf5b533b7..19a5ae8bfa2 100644
--- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -19,11 +19,6 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/buildfromdirectory2.phar');
-__HALT_COMPILER();
-?>
 --EXPECTF--
 %s(24) "UnexpectedValueException"
 RecursiveDirectoryIterator::__construct(1): %s (code: 2)
diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt
index 39dcdbe9612..7baa0c618fe 100644
--- a/ext/phar/tests/phar_gobyebye-win32.phpt
+++ b/ext/phar/tests/phar_gobyebye-win32.phpt
@@ -26,8 +26,10 @@ opendir("foo/hi");
 include $pname . '/foo/hi';
 ?>
 --CLEAN--
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
-<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?>
+<?php
+@unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
+unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php');
+?>
 --EXPECTF--
 Warning: readfile(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
 
diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
index 36ea9cac608..8fa55768b08 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
@@ -35,20 +35,15 @@ class myIterator implements Iterator
         reset($this->a);
     }
 }
-try {
-    chdir(__DIR__);
-    $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar');
-    var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . 'phpt'))));
-    var_dump($phar->isFileFormat(Phar::TAR));
-} catch (Exception $e) {
-    var_dump(get_class($e));
-    echo $e->getMessage() . "\n";
-}
+
+chdir(__DIR__);
+$phar = new Phar(__DIR__ . '/buildfromiterator4.phar.tar');
+var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . 'phpt'))));
+var_dump($phar->isFileFormat(Phar::TAR));
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/buildfromiterator.phar.tar');
-__HALT_COMPILER();
+unlink(__DIR__ . '/buildfromiterator4.phar.tar');
 ?>
 --EXPECTF--
 rewind
diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
index 0a857e424b2..146eceb5298 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
@@ -6,22 +6,16 @@ phar
 phar.readonly=0
 --FILE--
 <?php
-try {
-    chdir(__DIR__);
-    $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar');
-    $a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^frontcontroller\d{0,2}\.phar\.phpt\\z|^\.\\z|^\.\.\\z/'), __DIR__ . DIRECTORY_SEPARATOR);
-    asort($a);
-    var_dump($a);
-    var_dump($phar->isFileFormat(Phar::TAR));
-} catch (Exception $e) {
-    var_dump(get_class($e));
-    echo $e->getMessage() . "\n";
-}
+chdir(__DIR__);
+$phar = new Phar(__DIR__ . '/buildfromiterator8.phar.tar');
+$a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^frontcontroller\d{0,2}\.phar\.phpt\\z|^\.\\z|^\.\.\\z/'), __DIR__ . DIRECTORY_SEPARATOR);
+asort($a);
+var_dump($a);
+var_dump($phar->isFileFormat(Phar::TAR));
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/buildfromiterator.phar.tar');
-__HALT_COMPILER();
+unlink(__DIR__ . '/buildfromiterator8.phar.tar');
 ?>
 --EXPECTF--
 array(21) {
diff --git a/ext/phar/tests/tar/phar_buildfromiterator9.phpt b/ext/phar/tests/tar/phar_buildfromiterator9.phpt
index d67997afa91..483762dbad7 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator9.phpt
@@ -35,20 +35,15 @@ class myIterator implements Iterator
         reset($this->a);
     }
 }
-try {
-    chdir(__DIR__);
-    $phar = new Phar(__DIR__ . '/buildfromiterator.phar.tar');
-    var_dump($phar->buildFromIterator(new myIterator(array('a' => $a = fopen(basename(__FILE__, 'php') . 'phpt', 'r')))));
-    fclose($a);
-} catch (Exception $e) {
-    var_dump(get_class($e));
-    echo $e->getMessage() . "\n";
-}
+
+chdir(__DIR__);
+$phar = new Phar(__DIR__ . '/buildfromiterator9.phar.tar');
+var_dump($phar->buildFromIterator(new myIterator(array('a' => $a = fopen(basename(__FILE__, 'php') . 'phpt', 'r')))));
+fclose($a);
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__ . '/buildfromiterator.phar.tar');
-__HALT_COMPILER();
+unlink(__DIR__ . '/buildfromiterator9.phar.tar');
 ?>
 --EXPECTF--
 rewind
diff --git a/ext/sockets/tests/socket_clear_error-win32.phpt b/ext/sockets/tests/socket_clear_error-win32.phpt
index 158b6474f4a..3c8020e6f98 100644
--- a/ext/sockets/tests/socket_clear_error-win32.phpt
+++ b/ext/sockets/tests/socket_clear_error-win32.phpt
@@ -19,12 +19,6 @@ var_dump(socket_last_error($socket));
 socket_clear_error($socket);
 var_dump(socket_last_error($socket));
 ?>
---CLEAN--
-<?php
-socket_close($socket);
-unset($socket);
-unset($socketConn);
-?>
 --EXPECTF--
 Warning: socket_connect(): unable to connect [%d]: No connection could be made because the target machine actively refused it in %s on line %d
 int(%d)
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_hasChildren.phpt b/ext/spl/tests/RecursiveDirectoryIterator_hasChildren.phpt
index a4bad9b52d9..ff18c2b5073 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_hasChildren.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_hasChildren.phpt
@@ -30,6 +30,10 @@ bool(false)
 --CLEAN--
 <?php
 $dir = __DIR__ . DIRECTORY_SEPARATOR . 'symlinktest';
-unlink($dir . DIRECTORY_SEPARATOR . 'symlink');
+if (PHP_OS_FAMILY == 'Windows') {
+    rmdir($dir . DIRECTORY_SEPARATOR . 'symlink');
+} else {
+    unlink($dir . DIRECTORY_SEPARATOR . 'symlink');
+}
 rmdir($dir);
 ?>
diff --git a/ext/spl/tests/SplFileInfo_getExtension_basic.phpt b/ext/spl/tests/SplFileInfo_getExtension_basic.phpt
index 72597ef12d1..370257495b8 100644
--- a/ext/spl/tests/SplFileInfo_getExtension_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getExtension_basic.phpt
@@ -15,7 +15,7 @@ foreach ($exts as $ext) {
 $file = md5('SplFileInfo::getExtension');
 $exts = array('.txt', '.extension', '..', '.', '');
 foreach ($exts as $ext) {
-    unlink($file . $ext);
+    @unlink($file . $ext);
 }
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt
index 328e46dfd15..dbe108ba42c 100644
--- a/ext/standard/tests/file/005_variation-win32.phpt
+++ b/ext/standard/tests/file/005_variation-win32.phpt
@@ -139,7 +139,7 @@ unlink($file_path."/005_variation_softlink.tmp");
 unlink($file_path."/005_variation_hardlink.tmp");
 unlink($file_path."/005_variation1.tmp");
 unlink($file_path."/005_variation_copy.tmp");
-unlink($file_path."/005_variation_touch.tmp");
+@unlink($file_path."/005_variation_touch.tmp");
 unlink($file_path."/005_variation_touch_fly.tmp");
 unlink($file_path."/005_variation_touch_new.tmp");
 ?>
diff --git a/ext/standard/tests/file/bug65701.phpt b/ext/standard/tests/file/bug65701.phpt
index f70446a17e4..041ff2f8283 100644
--- a/ext/standard/tests/file/bug65701.phpt
+++ b/ext/standard/tests/file/bug65701.phpt
@@ -22,7 +22,7 @@ var_dump(filesize($dst));
 <?php
 $file_path = __DIR__ . "/bug65701/";
 foreach (scandir($file_path) as $file) {
-    if (strpos($file, "bug65701") !== false || 'WIN' == substr(PHP_OS, 0, 3)) {
+    if (!is_dir($file_path . $file)) {
         unlink($file_path . $file);
     }
 }
diff --git a/ext/standard/tests/file/copy_variation12-win32.phpt b/ext/standard/tests/file/copy_variation12-win32.phpt
index ecf857e6293..853a283c795 100644
--- a/ext/standard/tests/file/copy_variation12-win32.phpt
+++ b/ext/standard/tests/file/copy_variation12-win32.phpt
@@ -27,7 +27,6 @@ echo "*** Done ***\n";
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__."/copy_copy_variation12");
 rmdir(__DIR__."/copy_variation12");
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/file/realpath_basic4.phpt b/ext/standard/tests/file/realpath_basic4.phpt
index 524dde3056f..79897040653 100644
--- a/ext/standard/tests/file/realpath_basic4.phpt
+++ b/ext/standard/tests/file/realpath_basic4.phpt
@@ -12,8 +12,13 @@ echo "2. " . realpath("$file_path/realpath_basic4/link2/test") . "\n";
 --CLEAN--
 <?php
 $file_path = __DIR__;
-unlink("$file_path/realpath_basic4/link2");
-unlink("$file_path/realpath_basic4/link1");
+if (PHP_OS_FAMILY == 'Windows') {
+    rmdir("$file_path/realpath_basic4/link2");
+    rmdir("$file_path/realpath_basic4/link1");
+} else {
+    unlink("$file_path/realpath_basic4/link2");
+    unlink("$file_path/realpath_basic4/link1");
+}
 rmdir("$file_path/realpath_basic4/home/test");
 rmdir("$file_path/realpath_basic4/home");
 rmdir("$file_path/realpath_basic4");
diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt
index f90a9a9cd1b..4a2c97f9b2c 100644
--- a/ext/standard/tests/file/rename_variation-win32.phpt
+++ b/ext/standard/tests/file/rename_variation-win32.phpt
@@ -46,16 +46,12 @@ foreach($src_filenames as $src_filename) {
   unlink($dest_filename);
 }
 
-rmdir("$file_path/rename_variation");
-
 echo "Done\n";
 ?>
 --CLEAN--
 <?php
 $file_path = __DIR__;
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
+rmdir($file_path."/rename_variation");
 ?>
 --EXPECTF--
 *** Testing rename() : rename files across directories ***
diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt
index 1888838635d..194dde0086d 100644
--- a/ext/standard/tests/file/rename_variation1-win32.phpt
+++ b/ext/standard/tests/file/rename_variation1-win32.phpt
@@ -55,8 +55,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = __DIR__;
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
 rmdir($file_path."/rename_variation_dir");
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/rename_variation2-win32.phpt b/ext/standard/tests/file/rename_variation2-win32.phpt
index 9a5d56e48b2..b486fcc543d 100644
--- a/ext/standard/tests/file/rename_variation2-win32.phpt
+++ b/ext/standard/tests/file/rename_variation2-win32.phpt
@@ -34,16 +34,12 @@ var_dump( rename($file_path."/rename_variation2_dir/", $file_path."/12345") );
 var_dump( file_exists($file_path."/rename_variation2_dir" ) );  // expecting false
 var_dump( file_exists($file_path."/12345" ) );  // expecting true
 
-rmdir($file_path."/12345");
-
 echo "Done\n";
 ?>
 --CLEAN--
 <?php
 $file_path = __DIR__;
-unlink($file_path."/rename_variation2_link.tmp");
-unlink($file_path."/rename_variation2.tmp");
-rmdir($file_path."/rename_variation2_dir");
+rmdir($file_path."/12345");
 ?>
 --EXPECT--
 *** Testing rename() by renaming a file and directory to numeric name ***
diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt
index b8ed7fc0d11..8f347e5506f 100644
--- a/ext/standard/tests/file/rename_variation3-win32.phpt
+++ b/ext/standard/tests/file/rename_variation3-win32.phpt
@@ -51,9 +51,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = __DIR__;
-unlink($file_path."/rename_variation3_link.tmp");
-unlink($file_path."/rename_variation3.tmp");
-rmdir($file_path."/rename_variation3_dir");
 rmdir($file_path."/rename_variation3.tmp");
 ?>
 --EXPECTF--