4 files changed, 7 insertions, 2 deletions
diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt
index e04c6e8cd2..7abd3e216c 100644
--- a/ext/xmlreader/tests/002.phpt
+++ b/ext/xmlreader/tests/002.phpt
@@ -23,10 +23,12 @@ if (!$reader->open($filename)) {
 while ($reader->read()) {
 	echo $reader->name."\n";
 }
+$reader->close();
 unlink($filename);
 touch($filename);
 $reader = new XMLReader();
 $reader->open($filename);
+$reader->close();
 unlink($filename);
 
 ?>
diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index 3e32c7a193..48aa4be0ba 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -70,6 +70,7 @@ while ($reader->read()) {
 		}
 	}
 }
+$reader->close();
 unlink($filename);
 ?>
 ===DONE===
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index 77c9777ba9..d4f044e97f 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -29,6 +29,7 @@ while ($reader->read()) {
 		}
 	}
 }
+$reader->close();
 unlink($filename);
 ?>
 ===DONE===
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index afd1f7cec3..e3af00e4f7 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -22,7 +22,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </MOVIE>
 </LIST>';
 
-$dtdfile = dirname(__FILE__) . '/dtdexample.dtd'; 
+$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; 
 $file = dirname(__FILE__) . '/__008.xml';
 file_put_contents($file, $xmlstring);
 
@@ -35,10 +35,11 @@ while($reader->read());
 if ($reader->isValid()) {
 	echo "file DTD: ok\n";
 }
+$reader->close();
 unlink($file);
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE LIST SYSTEM "file:///' . dirname(__FILE__). '/dtdexample.dtd">
+<!DOCTYPE LIST SYSTEM "file:///' . $dtdfile. '">
 <LIST>
 <MOVIE ID="x200338360">
 <TITLE>Move Title 1</TITLE>