diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt
index fddfb65f29639..39715a615a02a 100644
--- a/ext/zip/tests/bug40228-mb.phpt
+++ b/ext/zip/tests/bug40228-mb.phpt
@@ -4,8 +4,8 @@ Bug #40228 (extractTo does not create recursive empty path)
 <?php if (!extension_loaded("zip")) print "skip"; ?>
 --FILE--
 <?php
-$dest = __DIR__;
-$arc_name = $dest . "/bug40228私はガラスを食べられます.zip";
+$dest = __DIR__ . "/bug40228-mb";
+$arc_name = __DIR__ . "/bug40228私はガラスを食べられます.zip";
 $zip = new ZipArchive;
 $zip->open($arc_name, ZIPARCHIVE::CREATE);
 $zip->extractTo($dest);
@@ -13,6 +13,7 @@ if (is_dir($dest . '/test/empty')) {
     echo "Ok\n";
     rmdir($dest . '/test/empty');
     rmdir($dest . '/test');
+    rmdir($dest);
 } else {
     echo "Failed.\n";
 }
diff --git a/ext/zip/tests/bug40228.phpt b/ext/zip/tests/bug40228.phpt
index 49e202c576baf..f9cd20f2439d1 100644
--- a/ext/zip/tests/bug40228.phpt
+++ b/ext/zip/tests/bug40228.phpt
@@ -4,8 +4,8 @@ Bug #40228 (extractTo does not create recursive empty path)
 <?php if (!extension_loaded("zip")) print "skip"; ?>
 --FILE--
 <?php
-$dest = __DIR__;
-$arc_name = $dest . "/bug40228.zip";
+$dest = __DIR__ . "/bug40228";
+$arc_name = __DIR__ . "/bug40228.zip";
 $zip = new ZipArchive;
 $zip->open($arc_name, ZIPARCHIVE::CREATE);
 $zip->extractTo($dest);
@@ -13,6 +13,7 @@ if (is_dir($dest . '/test/empty')) {
     echo "Ok\n";
     rmdir($dest . '/test/empty');
     rmdir($dest . '/test');
+    rmdir($dest);
 } else {
     echo "Failed.\n";
 }