diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
index 26bc35891cc..ade7cffcb82 100644
--- a/ext/curl/tests/curl_basic_009.phpt
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -7,7 +7,8 @@ curl
 --FILE--
 <?php
 
-$url = substr(uniqid(),0,7)."://www.".uniqid().".".uniqid();
+// Make sure the scheme always starts with an alphabetic character.
+$url = 'a' . substr(uniqid(),0,6)."://www.example.com";
 $ch = curl_init();
 curl_setopt($ch, CURLOPT_URL, $url);
 
diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index 038c569cd2d..78cfeb61fa9 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -42,25 +42,25 @@ zend_leak_variable(do_stuff("php://memory"));
 
 echo "\nDone.\n";
 ?>
---EXPECTF--
-temp stream (close after):
+--EXPECTREGEX--
+temp stream \(close after\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-memory stream (close after):
+memory stream \(close after\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-temp stream (leak):
+temp stream \(leak\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-memory stream (leak):
+memory stream \(leak\):
 About to rewind!
-* Couldn't open file /i_dont_exist/
-* Closing connection%A%d
+(\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
+\* Closing connection( -?\d+)?
 
-Done.
+Done\.