diff --git a/test/AllTests.php b/test/AllTests.php
index a49f98e29..29cc7ec37 100644
--- a/test/AllTests.php
+++ b/test/AllTests.php
@@ -32,6 +32,7 @@ require_once './test/PMA_transformation_getOptions_test.php';
 require_once './test/PMA_STR_sub_test.php';
 require_once './test/PMA_generateCommonUrl_test.php';
 //require_once './test/PMA_arrayWalkRecursive_test.php';
+require_once './test/PMA_blowfish_test.php';
 
 class AllTests
 {
@@ -59,6 +60,7 @@ class AllTests
         $suite->addTestSuite('PMA_STR_sub_test');
         $suite->addTestSuite('PMA_generate_common_url_test');
         //$suite->addTestSuite('PMA_arrayWalkRecursive_test');
+        $suite->addTestSuite('PMA_blowfish_test');
         return $suite;
     }
 }
diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php
new file mode 100644
index 000000000..64e749af3
--- /dev/null
+++ b/test/PMA_blowfish_test.php
@@ -0,0 +1,59 @@
+<?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
+/**
+ * Test for blowfish encryption.
+ *
+ * @package phpMyAdmin-test
+ * @version $Id: PMA_escapeJsString_test.php 10237 2007-04-01 08:23:23Z cybot_tm $
+ */
+
+/**
+ * Tests core.
+ */
+require_once 'PHPUnit/Framework.php';
+
+/**
+ * Include to test.
+ */
+require_once './libraries/blowfish.php';
+
+/**
+ * Test java script escaping.
+ *
+ */
+class PMA_blowfish_test extends PHPUnit_Framework_TestCase
+{
+    public function testEncryptDecryptNumbers()
+    {
+        $secret = '$%ÄüfuDFRR';
+        $string = '12345678';
+        $this->assertEquals($string, 
+            PMA_blowfish_decrypt(PMA_blowfish_encrypt($string, $secret), $secret));
+    }
+
+    public function testEncryptDecryptChars()
+    {
+        $secret = '$%ÄüfuDFRR';
+        $string = 'abcDEF012!"§$%&/()=?`´"\',.;:-_#+*~öäüÖÄÜ^°²³';
+        $this->assertEquals($string, 
+            PMA_blowfish_decrypt(PMA_blowfish_encrypt($string, $secret), $secret));
+    }
+
+    public function testEncrypt()
+    {
+        $secret = '$%ÄüfuDFRR';
+        $decrypted = '12345678';
+        $encrypted = 'p0nz15awFT4=';
+        $this->assertEquals($encrypted, PMA_blowfish_encrypt($decrypted, $secret));
+    }
+
+    public function testDecrypt()
+    {
+        $secret = '$%ÄüfuDFRR';
+        $encrypted = 'p0nz15awFT4=';
+        $decrypted = '12345678';
+        $this->assertEquals($decrypted, PMA_blowfish_decrypt($encrypted, $secret));
+    }
+
+}
+?>