diff --git a/testsuite/testutils.c b/testsuite/testutils.c
index b6e4a785e7c1f321c196eeea4c32c1bf56653a40..9e5dda13db63ab882e48a9e86d708da664bd2f32 100644
--- a/testsuite/testutils.c
+++ b/testsuite/testutils.c
@@ -222,6 +222,37 @@ test_hash(const struct nettle_hash *hash,
     FAIL();
 }
 
+void
+test_armor(const struct nettle_armor *armor,
+           unsigned data_length,
+           const uint8_t *data,
+           const uint8_t *ascii)
+{
+  uint8_t *buffer = alloca(1 + strlen(ascii));
+  uint8_t *check = alloca(1 + data_length);
+
+  memset(buffer, 0, 1 + strlen(ascii));
+  memset(check, 0, 1 + data_length);
+
+  if (strlen(ascii) != armor->encode(buffer, data_length, data))
+    FAIL();
+
+  if (!MEMEQ(strlen(ascii), buffer, ascii))
+    FAIL();
+
+  if (buffer[strlen(ascii)])
+    FAIL();  
+
+  if (data_length != armor->decode(check, strlen(ascii), buffer))
+    FAIL();
+
+  if (!MEMEQ(data_length, check, data))
+    FAIL();
+
+  if (check[data_length])
+    FAIL();
+}
+
 #if HAVE_LIBGMP
 #define SIGN(key, hash, msg, signature) do {	\
   hash##_update(&hash, LDATA(msg));		\
diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index 3c2756feb54c7e4629b19a7cfb0b24619b35b105..28f66014952f138e90362d3dc387458b5437d0b4 100644
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -58,6 +58,12 @@ test_hash(const struct nettle_hash *hash,
 	  const uint8_t *data,
 	  const uint8_t *digest);
 
+void
+test_armor(const struct nettle_armor *armor,
+           unsigned data_length,
+           const uint8_t *data,
+           const uint8_t *ascii);
+
 #if HAVE_LIBGMP
 void
 test_rsa_md5(struct rsa_public_key *pub,