diff --git a/ext/hash/tests/hash_update_stream_basic_001.phpt b/ext/hash/tests/hash_update_stream_basic_001.phpt
new file mode 100644
index 00000000000..c145784dc94
--- /dev/null
+++ b/ext/hash/tests/hash_update_stream_basic_001.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Ensure hash_update_stream() always returns the same hash when $length = 0
+--CREDITS--
+Symeon Charalabides <symeon@systasis.com> - @phpdublin
+--SKIPIF--
+<?php
+if (!extension_loaded('openssl')) die('skip openssl extension not available');
+?>
+--FILE--
+<?php
+
+for ($j=0; $j<3; $j++)
+{
+    // Create pseudo-random hash
+    $bytes = openssl_random_pseudo_bytes(15, $cstrong);
+    $hash   = sha1(bin2hex($bytes));
+
+    // Create temp file with hash
+    $fp = tmpfile();
+    fwrite($fp, $hash);
+    rewind($fp);
+
+    // Stream it with 0 length and output hash
+    $ctx = hash_init('md5');
+    hash_update_stream($ctx, $fp, 0);
+    echo hash_final($ctx) . "\n";
+}
+
+?>
+--EXPECT--
+d41d8cd98f00b204e9800998ecf8427e
+d41d8cd98f00b204e9800998ecf8427e
+d41d8cd98f00b204e9800998ecf8427e