diff --git a/tests/bug00625.phpt b/tests/bug00625-1.phpt
similarity index 77%
rename from tests/bug00625.phpt
rename to tests/bug00625-1.phpt
index 4d2939101..39c724720 100644
--- a/tests/bug00625.phpt
+++ b/tests/bug00625-1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #625: xdebug_get_headers() resets header list
+Test for bug #625: xdebug_get_headers() resets header list (1)
 --INI--
 xdebug.default_enable=1
 --FILE--
diff --git a/tests/bug00625-2.phpt b/tests/bug00625-2.phpt
new file mode 100644
index 000000000..f5d280128
--- /dev/null
+++ b/tests/bug00625-2.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Test for bug #625: xdebug_get_headers() resets header list (2)
+--INI--
+xdebug.default_enable=1
+default_charset=utf-8
+--FILE--
+<?php
+header('Content-type: text/plain');
+var_dump( xdebug_get_headers( ) );
+var_dump( xdebug_get_headers( ) );
+?>
+--EXPECTF--
+array(1) {
+  [0] =>
+  string(38) "Content-type: text/plain;charset=utf-8"
+}
+array(1) {
+  [0] =>
+  string(38) "Content-type: text/plain;charset=utf-8"
+}
diff --git a/tests/bug00627.phpt b/tests/bug00627.phpt
index 69bd7e10e..e5600ff4d 100644
--- a/tests/bug00627.phpt
+++ b/tests/bug00627.phpt
@@ -30,7 +30,7 @@ dbgpRun( $data, $commands );
 
 -> run -i 3
 <?xml version="1.0" encoding="iso-8859-1"?>
-<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" command="run" transaction_id="3" status="break" reason="ok"><xdebug:message filename="file://%s/bug00627-symlink-target.inc" lineno="4"></xdebug:message></response>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" command="run" transaction_id="3" status="break" reason="ok"><xdebug:message filename="file://%sbug00627-symlink-target.inc" lineno="4"></xdebug:message></response>
 
 -> context_get -i 4 -d 0
 <?xml version="1.0" encoding="iso-8859-1"?>
diff --git a/tests/error_collection_3.phpt b/tests/error_collection_3.phpt
index 066061b48..da1479054 100644
--- a/tests/error_collection_3.phpt
+++ b/tests/error_collection_3.phpt
@@ -29,7 +29,7 @@ array(1) {
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%serror_collection_3.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%serror_collection_3.php@0'>../error_collection_3.php<b>:</b>0</a></td></tr>
-<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/trigger_error.html' target='_new'>trigger_error</a>
+<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
 ( <span>&#39;An error&#39;</span>, <span>512</span> )</td><td title='%serror_collection_3.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%serror_collection_3.php@4'>../error_collection_3.php<b>:</b>4</a></td></tr>
 </table></font>
 "
diff --git a/tests/scream_html.phpt b/tests/scream_html.phpt
index 7cdab53c3..789f0642c 100644
--- a/tests/scream_html.phpt
+++ b/tests/scream_html.phpt
@@ -23,6 +23,6 @@ echo @strstr(), "\n";
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sscream_html.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%sscream_html.php@0'>../scream_html.php<b>:</b>0</a></td></tr>
-<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/strstr.html' target='_new'>strstr</a>
+<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.strstr.html' target='_new'>strstr</a>
 (  )</td><td title='%sscream_html.php' bgcolor='#eeeeec'><a style='color: black' href='xdebug://%sscream_html.php@4'>../scream_html.php<b>:</b>4</a></td></tr>
 </table></font>