diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt
new file mode 100644
index 00000000000..af322f482b0
--- /dev/null
+++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt
@@ -0,0 +1,74 @@
+--TEST--
+Test disk_free_space and its alias diskfreespace() functions : error conditions
+--SKIPIF--
+<?php
+if(substr(PHP_OS, 0, 3) != 'WIN' )
+  die("skip Valid only for Windows");
+?>
+--FILE--
+<?php
+/*
+ *  Prototype: float disk_free_space( string directory )
+ *  Description: Given a string containing a directory, this function will
+ *               return the number of bytes available on the corresponding 
+ *               filesystem or disk partition
+ */
+
+echo "*** Testing error conditions ***\n";
+$file_path = dirname(__FILE__);
+var_dump( disk_free_space() ); // Zero Arguments
+var_dump( diskfreespace() );
+
+var_dump( disk_free_space( $file_path, "extra argument") ); // More than valid number of arguments
+var_dump( diskfreespace( $file_path, "extra argument") );
+
+
+var_dump( disk_free_space( $file_path."/dir1" )); // Invalid directory
+var_dump( diskfreespace( $file_path."/dir1" ));
+
+$fh = fopen( $file_path."/disk_free_space.tmp", "w" );
+fwrite( $fh, " Garbage data for the temporary file" );
+var_dump( disk_free_space( $file_path."/disk_free_space.tmp" )); // file input instead of directory
+var_dump( diskfreespace( $file_path."/disk_free_space.tmp" ));
+fclose($fh);
+
+echo"\n-- Done --";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/disk_free_space.tmp");
+
+?>
+--EXPECTF--
+*** Testing error conditions ***
+
+Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: disk_free_space() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: disk_free_space(): The system cannot find the path specified.
+ in %s on line %d
+bool(false)
+
+Warning: diskfreespace(): The system cannot find the path specified.
+ in %s on line %d
+bool(false)
+
+Warning: disk_free_space(): The directory name is invalid.
+ in %s on line %d
+bool(false)
+
+Warning: diskfreespace(): The directory name is invalid.
+ in %s on line %d
+bool(false)
+
+-- Done --
diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt
new file mode 100644
index 00000000000..ee5abc8e8a3
--- /dev/null
+++ b/ext/standard/tests/file/disk_free_space_error.phpt
@@ -0,0 +1,66 @@
+--TEST--
+Test disk_free_space and its alias diskfreespace() functions : error conditions
+--SKIPIF--
+<?php
+if(substr(PHP_OS, 0, 3) == 'WIN' )
+  die("skip Not Valid for Windows");
+?>
+--FILE--
+<?php
+/*
+ *  Prototype: float disk_free_space( string directory )
+ *  Description: Given a string containing a directory, this function will
+ *               return the number of bytes available on the corresponding 
+ *               filesystem or disk partition
+ */
+
+echo "*** Testing error conditions ***\n";
+$file_path = dirname(__FILE__);
+var_dump( disk_free_space() ); // Zero Arguments
+var_dump( diskfreespace() );
+
+var_dump( disk_free_space( $file_path, "extra argument") ); // More than valid number of arguments
+var_dump( diskfreespace( $file_path, "extra argument") );
+
+
+var_dump( disk_free_space( $file_path."/dir1" )); // Invalid directory
+var_dump( diskfreespace( $file_path."/dir1" ));
+
+$fh = fopen( $file_path."/disk_free_space.tmp", "w" );
+fwrite( $fh, " Garbage data for the temporary file" );
+var_dump( disk_free_space( $file_path."/disk_free_space.tmp" )); // file input instead of directory
+var_dump( diskfreespace( $file_path."/disk_free_space.tmp" ));
+fclose($fh);
+
+echo"\n-- Done --";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/disk_free_space.tmp");
+
+?>
+--EXPECTF--
+*** Testing error conditions ***
+
+Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: disk_free_space() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: disk_free_space(): No such file or directory in %s on line %d
+bool(false)
+
+Warning: diskfreespace(): No such file or directory in %s on line %d
+bool(false)
+float(%d)
+float(%d)
+
+-- Done --
diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt
new file mode 100644
index 00000000000..19f3f93bef4
--- /dev/null
+++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt
@@ -0,0 +1,55 @@
+--TEST--
+Test disk_total_space() function : error conditions
+--SKIPIF--
+<?php
+if(substr(PHP_OS, 0, 3) != 'WIN' )
+  die("skip Valid only for Windows");
+?>
+--FILE--
+<?php
+/*
+ *  Prototype: float disk_total_space( string $directory );
+ *  Description: given a string containing a directory, this function
+ *               will return the total number of bytes on the corresponding 
+ *               filesystem or disk partition
+ */
+
+echo "*** Testing error conditions ***\n";
+$file_path = dirname(__FILE__);
+var_dump( disk_total_space() ); // Zero Arguments
+
+var_dump( disk_total_space( $file_path, "extra argument") ); // More than valid number of arguments
+
+
+var_dump( disk_total_space( $file_path."/dir1" )); // Invalid directory
+
+$fh = fopen( $file_path."/disk_total_space.tmp", "w" );
+fwrite( $fh, " Garbage data for the temporary file" );
+var_dump( disk_total_space( $file_path."/disk_total_space.tmp" )); // file input instead of directory
+fclose($fh);
+
+echo"\n--- Done ---";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/disk_total_space.tmp");
+?>
+--EXPECTF--
+*** Testing error conditions ***
+
+Warning: disk_total_space() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: disk_total_space() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: disk_total_space(): The system cannot find the path specified.
+ in %s on line %d
+bool(false)
+
+Warning: disk_total_space(): The directory name is invalid.
+ in %s on line %d
+bool(false)
+
+--- Done ---
diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt
new file mode 100644
index 00000000000..4050997e8e4
--- /dev/null
+++ b/ext/standard/tests/file/disk_total_space_error.phpt
@@ -0,0 +1,51 @@
+--TEST--
+Test disk_total_space() function : error conditions
+--SKIPIF--
+<?php
+if(substr(PHP_OS, 0, 3) == 'WIN' )
+  die("skip Not Valid for Windows");
+?>
+--FILE--
+<?php
+/*
+ *  Prototype: float disk_total_space( string $directory );
+ *  Description: given a string containing a directory, this function
+ *               will return the total number of bytes on the corresponding 
+ *               filesystem or disk partition
+ */
+
+echo "*** Testing error conditions ***\n";
+$file_path = dirname(__FILE__);
+var_dump( disk_total_space() ); // Zero Arguments
+
+var_dump( disk_total_space( $file_path, "extra argument") ); // More than valid number of arguments
+
+
+var_dump( disk_total_space( $file_path."/dir1" )); // Invalid directory
+
+$fh = fopen( $file_path."/disk_total_space.tmp", "w" );
+fwrite( $fh, " Garbage data for the temporary file" );
+var_dump( disk_total_space( $file_path."/disk_total_space.tmp" )); // file input instead of directory
+fclose($fh);
+
+echo"\n--- Done ---";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/disk_total_space.tmp");
+?>
+--EXPECTF--
+*** Testing error conditions ***
+
+Warning: disk_total_space() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: disk_total_space() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+
+Warning: disk_total_space(): No such file or directory in %s on line %d
+bool(false)
+float(%d)
+
+--- Done ---