diff --git a/ext/mcrypt/tests/blowfish.phpt b/ext/mcrypt/tests/blowfish.phpt
new file mode 100644
index 00000000000..c2273c165d9
--- /dev/null
+++ b/ext/mcrypt/tests/blowfish.phpt
@@ -0,0 +1,77 @@
+--TEST--
+Test for blowfish compatibility
+--SKIPIF--
+<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
+--POST--
+--GET--
+--FILE--
+<?php
+function hex2bin($data) {
+    $len = strlen($data);
+    return pack("H" . $len, $data);
+}   
+
+print "key               plain             crypt             guess             stat\n";
+$null = "\0\0\0\0\0\0\0\0";
+$vectors = file("ext/mcrypt/tests/vectors.txt");
+
+$td = mcrypt_module_open ("blowfish", "", MCRYPT_MODE_ECB, "");
+
+foreach($vectors as $data) {
+    $data = trim($data);
+    if ($data) {
+        list($key,$plain,$crypt) = split("[[:space:]]+",$data);
+        printf("%s  %s  ",
+            $key,
+            $plain
+        );  
+        $key = hex2bin(trim($key));
+        $plain = hex2bin(($plain));
+        $crypt = strtolower(trim($crypt));
+
+        mcrypt_generic_init ($td, $key, $null);
+        $guess = mcrypt_generic ($td, $plain);
+        $guess = bin2hex($guess);
+        printf("%s  %s  %s\n",
+            $crypt,
+            $guess,
+            ($crypt==$guess ? "OK" : "BAD")
+        );  
+    }   
+}   
+?>
+--EXPECT--
+key               plain             crypt             guess             stat
+0000000000000000  0000000000000000  4ef997456198dd78  4ef997456198dd78  OK
+FFFFFFFFFFFFFFFF  FFFFFFFFFFFFFFFF  51866fd5b85ecb8a  51866fd5b85ecb8a  OK
+3000000000000000  1000000000000001  7d856f9a613063f2  7d856f9a613063f2  OK
+1111111111111111  1111111111111111  2466dd878b963c9d  2466dd878b963c9d  OK
+0123456789ABCDEF  1111111111111111  61f9c3802281b096  61f9c3802281b096  OK
+1111111111111111  0123456789ABCDEF  7d0cc630afda1ec7  7d0cc630afda1ec7  OK
+FEDCBA9876543210  0123456789ABCDEF  0aceab0fc6a0a28d  0aceab0fc6a0a28d  OK
+7CA110454A1A6E57  01A1D6D039776742  59c68245eb05282b  59c68245eb05282b  OK
+0131D9619DC1376E  5CD54CA83DEF57DA  b1b8cc0b250f09a0  b1b8cc0b250f09a0  OK
+07A1133E4A0B2686  0248D43806F67172  1730e5778bea1da4  1730e5778bea1da4  OK
+3849674C2602319E  51454B582DDF440A  a25e7856cf2651eb  a25e7856cf2651eb  OK
+04B915BA43FEB5B6  42FD443059577FA2  353882b109ce8f1a  353882b109ce8f1a  OK
+0113B970FD34F2CE  059B5E0851CF143A  48f4d0884c379918  48f4d0884c379918  OK
+0170F175468FB5E6  0756D8E0774761D2  432193b78951fc98  432193b78951fc98  OK
+43297FAD38E373FE  762514B829BF486A  13f04154d69d1ae5  13f04154d69d1ae5  OK
+07A7137045DA2A16  3BDD119049372802  2eedda93ffd39c79  2eedda93ffd39c79  OK
+04689104C2FD3B2F  26955F6835AF609A  d887e0393c2da6e3  d887e0393c2da6e3  OK
+37D06BB516CB7546  164D5E404F275232  5f99d04f5b163969  5f99d04f5b163969  OK
+1F08260D1AC2465E  6B056E18759F5CCA  4a057a3b24d3977b  4a057a3b24d3977b  OK
+584023641ABA6176  004BD6EF09176062  452031c1e4fada8e  452031c1e4fada8e  OK
+025816164629B007  480D39006EE762F2  7555ae39f59b87bd  7555ae39f59b87bd  OK
+49793EBC79B3258F  437540C8698F3CFA  53c55f9cb49fc019  53c55f9cb49fc019  OK
+4FB05E1515AB73A7  072D43A077075292  7a8e7bfa937e89a3  7a8e7bfa937e89a3  OK
+49E95D6D4CA229BF  02FE55778117F12A  cf9c5d7a4986adb5  cf9c5d7a4986adb5  OK
+018310DC409B26D6  1D9D5C5018F728C2  d1abb290658bc778  d1abb290658bc778  OK
+1C587F1C13924FEF  305532286D6F295A  55cb3774d13ef201  55cb3774d13ef201  OK
+0101010101010101  0123456789ABCDEF  fa34ec4847b268b2  fa34ec4847b268b2  OK
+1F1F1F1F0E0E0E0E  0123456789ABCDEF  a790795108ea3cae  a790795108ea3cae  OK
+E0FEE0FEF1FEF1FE  0123456789ABCDEF  c39e072d9fac631d  c39e072d9fac631d  OK
+0000000000000000  FFFFFFFFFFFFFFFF  014933e0cdaff6e4  014933e0cdaff6e4  OK
+FFFFFFFFFFFFFFFF  0000000000000000  f21e9a77b71c49bc  f21e9a77b71c49bc  OK
+0123456789ABCDEF  0000000000000000  245946885754369a  245946885754369a  OK
+FEDCBA9876543210  FFFFFFFFFFFFFFFF  6b5c5a9c5d9e0a5a  6b5c5a9c5d9e0a5a  OK