diff --git a/ext/session/mod_files.bat b/ext/session/mod_files.bat
index 83f85eb66bc..f3c8695927e 100644
--- a/ext/session/mod_files.bat
+++ b/ext/session/mod_files.bat
@@ -6,11 +6,11 @@ IF _%1_==_AUTO_ (
 )
 
 IF _%2_==__ (
-	ECHO Usage %0 ^<basedir^> ^<depth^> ^[^hash_bits^]
+	ECHO Usage %0 ^<basedir^> ^<depth^> ^[^bits^]
 	ECHO.
 	ECHO Where ^<basedir^>   is the session directory
 	ECHO       ^<depth^>     is the number of levels defined in session.save_path
-	ECHO       ^[hash_bits^] is the number of bits defined in session.hash_bits_per_character
+	ECHO       ^[bits^]      is the number of bits defined in session.sid_bits_per_character
 	EXIT /B 1
 )
 
@@ -53,5 +53,5 @@ ECHO ERROR: Invalid depth : %2
 EXIT /B 0
 
 :BitsError
-ECHO ERROR: Invalid hash_bits : %3
+ECHO ERROR: Invalid bits : %3
 EXIT /B 0
diff --git a/ext/session/tests/031.phpt b/ext/session/tests/031.phpt
deleted file mode 100644
index 63a90a6da5e..00000000000
--- a/ext/session/tests/031.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-setting hash_function to sha512 and hash_bits_per_character > 4 should not crash
---EXTENSIONS--
-session
---SKIPIF--
-<?php include('skipif.inc'); ?>
---INI--
-session.use_cookies=0
-session.cache_limiter=
-session.serialize_handler=php
-session.save_handler=files
-session.hash_function=sha512
-session.hash_bits_per_character=5
---FILE--
-<?php
-error_reporting(E_ALL);
-
-session_start();
-session_regenerate_id(TRUE);
-
-print "I live\n";
-?>
---EXPECT--
-I live
diff --git a/ext/session/tests/session_basic2.phpt b/ext/session/tests/session_basic2.phpt
index 6bd94969e7d..165ca21af52 100644
--- a/ext/session/tests/session_basic2.phpt
+++ b/ext/session/tests/session_basic2.phpt
@@ -3,7 +3,6 @@ Test basic function : variation2
 --INI--
 session.use_strict_mode=1
 session.save_handler=files
-session.hash_bits_per_character=4
 session.gc_probability=1
 session.gc_divisor=1000
 session.gc_maxlifetime=300
diff --git a/ext/session/tests/session_basic3.phpt b/ext/session/tests/session_basic3.phpt
index 61173feeefc..661f48546d1 100644
--- a/ext/session/tests/session_basic3.phpt
+++ b/ext/session/tests/session_basic3.phpt
@@ -5,8 +5,6 @@ session.use_strict_mode=0
 session.use_only_cookies=0
 session.use_trans_sid=1
 session.save_handler=files
-session.hash_bits_per_character=4
-session.hash_function=0
 session.gc_probability=1
 session.gc_divisor=1000
 session.gc_maxlifetime=300
diff --git a/ext/session/tests/session_basic4.phpt b/ext/session/tests/session_basic4.phpt
index 996fcac3647..93b04604d24 100644
--- a/ext/session/tests/session_basic4.phpt
+++ b/ext/session/tests/session_basic4.phpt
@@ -5,8 +5,6 @@ session.use_strict_mode=0
 session.use_only_cookies=0
 session.use_trans_sid=1
 session.save_handler=files
-session.hash_bits_per_character=4
-session.hash_function=0
 session.gc_probability=1
 session.gc_divisor=1000
 session.gc_maxlifetime=300
diff --git a/ext/session/tests/session_basic5.phpt b/ext/session/tests/session_basic5.phpt
index f9399428a9b..4f1d39ee027 100644
--- a/ext/session/tests/session_basic5.phpt
+++ b/ext/session/tests/session_basic5.phpt
@@ -5,8 +5,6 @@ session.use_strict_mode=0
 session.use_only_cookies=0
 session.use_trans_sid=1
 session.save_handler=files
-session.hash_bits_per_character=4
-session.hash_function=0
 session.gc_probability=1
 session.gc_divisor=1000
 session.gc_maxlifetime=300