3 files changed, 8 insertions, 12 deletions
diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt
index 2ed10d92a2..a2dc01b512 100644
--- a/ext/session/tests/session_name_error.phpt
+++ b/ext/session/tests/session_name_error.phpt
@@ -167,8 +167,6 @@ string(12) "Hello World!"
 string(0) ""
 
 -- Iteration 24 --
-
-Warning: session_name() expects parameter 1 to be string, resource given in %s on line %d
-NULL
+string(0) ""
 Done
 
diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt
index 815feee6ba..b58e731334 100644
--- a/ext/session/tests/session_save_path_error.phpt
+++ b/ext/session/tests/session_save_path_error.phpt
@@ -171,8 +171,6 @@ string(12) "Hello World!"
 string(0) ""
 
 -- Iteration 24 --
-
-Warning: session_save_path() expects parameter 1 to be string, resource given in %s on line %d
-NULL
+string(0) ""
 Done
 
diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt
index 453645d314..6ea725cd89 100644
--- a/ext/session/tests/session_save_path_variation4.phpt
+++ b/ext/session/tests/session_save_path_variation4.phpt
@@ -22,10 +22,10 @@ ob_start();
  */
 
 echo "*** Testing session_save_path() : variation ***\n";
-$directory = dirname(__FILE__);
-$sessions = ($directory."/sessions");
+$initdir = getcwd();
+$sessions = ($initdir."/sessions");
 
-chdir($directory);
+chdir($initdir);
 
 // Delete the existing directory
 if (file_exists($sessions) === TRUE) {
@@ -34,7 +34,7 @@ if (file_exists($sessions) === TRUE) {
 
 var_dump(mkdir($sessions));
 var_dump(chdir($sessions));
-ini_set("session.save_path", $directory);
+ini_set("session.save_path", $initdir);
 var_dump(session_save_path());
 var_dump(session_start());
 var_dump(session_save_path());
@@ -46,8 +46,8 @@ echo "Done";
 ob_end_flush();
 ?>
 --CLEAN--
-$directory = dirname(__FILE__);
-$sessions = ($directory."/sessions");
+$initdir = getcwd();
+$sessions = ($initdir."/sessions");
 var_dump(rmdir($sessions));
 --EXPECTF--
 *** Testing session_save_path() : variation ***