diff --git a/.travis.yml b/.travis.yml
index 3251bc03003..2ac24b603df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,6 +51,7 @@ before_script:
     export CACHE_SQL_PDO_MYSQL_TEST_CONFIG='{"cache":{"sql":{"pdo_mysql":{"adapter":"pdo_mysql","host":"localhost","username":"root","password":"","dbname":"test","charset":"utf-8"}}}}';
     export CACHE_SQL_PDO_PGSQL_TEST_CONFIG='{"cache":{"sql":{"pdo_pgsql":{"adapter":"pdo_pgsql","username":"postgres","password":"","dbname":"test","charset":"utf-8"}}}}';
     export CRYPT_TEST_CONFIG='{"crypt":{"keyserver":false}}';
+    export CRYPTPGP_TEST_CONFIG='{"gnupg":"/usr/bin/gnupg","gnupg2":"/usr/bin/gnupg2"}';
     export DB_ADAPTER_MYSQL_TEST_CONFIG='{"db":{"adapter":{"mysql":{"test":{"host":"localhost","username":"root","password":"","dbname":"test"}}}}}';
     export DB_ADAPTER_MYSQLI_TEST_CONFIG='{"db":{"adapter":{"mysqli":{"test":{"host":"localhost","username":"root","password":"","dbname":"test"}}}}}';
     export DB_ADAPTER_PDO_MYSQL_TEST_CONFIG='{"db":{"adapter":{"pdo":{"mysql":{"test":{"host":"localhost","username":"root","password":"","dbname":"test"}}}}}}';
diff --git a/framework/Crypt/test/Horde/Crypt/Pgp/BinaryTest.php b/framework/Crypt/test/Horde/Crypt/Pgp/BinaryTest.php
index 3e3eb732e4c..1defcbf37b0 100644
--- a/framework/Crypt/test/Horde/Crypt/Pgp/BinaryTest.php
+++ b/framework/Crypt/test/Horde/Crypt/Pgp/BinaryTest.php
@@ -27,7 +27,12 @@ protected function _setUp()
             ));
         }
 
-        return array(new Horde_Crypt_Pgp_Backend_Binary($gnupg));
+        $backends = array(new Horde_Crypt_Pgp_Backend_Binary($gnupg));
+        if (!empty($c['gnupg2'])) {
+            $backends[] = new Horde_Crypt_Pgp_Backend_Binary($c['gnupg2']);
+        }
+
+        return $backends;
     }
 
 }
diff --git a/framework/Crypt/test/Horde/Crypt/conf.php.dist b/framework/Crypt/test/Horde/Crypt/conf.php.dist
index aec961a3393..b891ef0e52f 100644
--- a/framework/Crypt/test/Horde/Crypt/conf.php.dist
+++ b/framework/Crypt/test/Horde/Crypt/conf.php.dist
@@ -1,2 +1,3 @@
 <?php
 $conf['gnupg'] = '/usr/bin/gpg';
+$conf['gnupg2'] = false;