diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 49db18e12..350b60adf 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -45,6 +45,7 @@ TESTS_ENVIRONMENT = LC_ALL=C \
 
 XTESTS = \
 	version.scm \
+	enarmor.scm \
 	mds.scm \
 	decrypt.scm \
 	decrypt-multifile.scm \
diff --git a/tests/openpgp/enarmor.scm b/tests/openpgp/enarmor.scm
new file mode 100755
index 000000000..a301ccda4
--- /dev/null
+++ b/tests/openpgp/enarmor.scm
@@ -0,0 +1,31 @@
+#!/usr/bin/env gpgscm
+
+;; Copyright (C) 2016 g10 Code GmbH
+;;
+;; This file is part of GnuPG.
+;;
+;; GnuPG is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GnuPG is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+(load (with-path "defs.scm"))
+(setup-legacy-environment)
+
+(for-each-p
+ "Checking armor encoding and decoding"
+ (lambda (source)
+   (tr:do
+    (tr:open source)
+    (tr:gpg "" `(--enarmor))
+    (tr:gpg "" '(--dearmor))
+    (tr:assert-identity source)))
+ (append plain-files data-files))