diff --git a/ext/readline/tests/libedit_info_001-win32.phpt b/ext/readline/tests/libedit_info_001-win32.phpt
deleted file mode 100644
index 59202ee772384..0000000000000
--- a/ext/readline/tests/libedit_info_001-win32.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-readline_info(): Basic test
---EXTENSIONS--
-readline
---SKIPIF--
-<?php if (READLINE_LIB != "libedit") die("skip libedit only");
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
-}
-?>
---FILE--
-<?php
-
-var_dump(readline_info());
-var_dump(readline_info(1));
-var_dump(readline_info(1,1));
-var_dump(readline_info('line_buffer'));
-var_dump(readline_info('readline_name'));
-var_dump(readline_info('readline_name', 1));
-var_dump(readline_info('readline_name'));
-var_dump(readline_info('attempted_completion_over',1));
-var_dump(readline_info('attempted_completion_over'));
-
-?>
---EXPECT--
-array(4) {
-  ["line_buffer"]=>
-  string(0) ""
-  ["point"]=>
-  int(0)
-  ["readline_name"]=>
-  string(0) ""
-  ["attempted_completion_over"]=>
-  int(0)
-}
-NULL
-NULL
-string(0) ""
-string(0) ""
-string(0) ""
-string(1) "1"
-int(0)
-int(1)
diff --git a/ext/readline/tests/libedit_info_001.phpt b/ext/readline/tests/libedit_info_001.phpt
index cb1ac929829ba..1b2d90887d1fc 100644
--- a/ext/readline/tests/libedit_info_001.phpt
+++ b/ext/readline/tests/libedit_info_001.phpt
@@ -4,9 +4,6 @@ readline_info(): Basic test
 readline
 --SKIPIF--
 <?php if (READLINE_LIB != "libedit") die("skip libedit only");
-if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-    die('skip not for windows');
-}
 if (getenv('SKIP_REPEAT')) die("skip readline has global state");
 ?>
 --FILE--
@@ -28,11 +25,7 @@ array(%d) {
   ["line_buffer"]=>
   string(0) ""
   ["point"]=>
-  int(0)
-  ["end"]=>
   int(0)%A
-  ["library_version"]=>
-  string(%d) "%s"
   ["readline_name"]=>
   string(0) ""
   ["attempted_completion_over"]=>
diff --git a/ext/readline/tests/libedit_write_history_001-win32.phpt b/ext/readline/tests/libedit_write_history_001-win32.phpt
deleted file mode 100644
index 9dec2d58b2911..0000000000000
--- a/ext/readline/tests/libedit_write_history_001-win32.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-readline_write_history(): Basic test
---EXTENSIONS--
-readline
---SKIPIF--
-<?php if (!function_exists('readline_add_history')) die("skip");
-if (READLINE_LIB != "libedit") die("skip libedit only");
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
-}
-?>
---FILE--
-<?php
-
-$name = tempnam(sys_get_temp_dir(), 'readline.tmp');
-
-readline_add_history('foo');
-readline_add_history('');
-readline_add_history(1);
-readline_write_history($name);
-
-var_dump(file_get_contents($name));
-
-unlink($name);
-
-?>
---EXPECT--
-string(6) "foo
-1
-"
diff --git a/ext/readline/tests/libedit_write_history_001.phpt b/ext/readline/tests/libedit_write_history_001.phpt
index 52a2c4a0a8fe4..ba3d65ee507c4 100644
--- a/ext/readline/tests/libedit_write_history_001.phpt
+++ b/ext/readline/tests/libedit_write_history_001.phpt
@@ -5,29 +5,25 @@ readline
 --SKIPIF--
 <?php if (!function_exists('readline_add_history')) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
-if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-    die('skip not for windows');
-}
 if (getenv('SKIP_REPEAT')) die("skip readline has global state");
 ?>
 --FILE--
 <?php
 
-$name = tempnam('/tmp', 'readline.tmp');
+$name = tempnam(sys_get_temp_dir(), 'readline.tmp');
 
 readline_add_history('foo');
 readline_add_history('');
 readline_add_history(1);
 readline_write_history($name);
 
-var_dump(file_get_contents($name));
+echo(file_get_contents($name));
 
 unlink($name);
 
 ?>
---EXPECT--
-string(20) "_HiStOrY_V2_
-foo
-
-1
-"
+--EXPECTREGEX--
+(_HiStOrY_V2_
+)?foo
+(
+)?1