diff --git a/tests/suite.php b/tests/suite.php
index 2c506f4..fbd6f3b 100644
--- a/tests/suite.php
+++ b/tests/suite.php
@@ -437,3 +437,15 @@ public function test000083002sig() {
     $this->oneIssuer("000083-002.sig", "BD7BA7BC5547FD09");
   }
 }
+
+class Armor extends TestCase {
+  public function testRoundTrip() {
+    $bytes = "abcd\0\xff";
+    $this->assertEquals($bytes, OpenPGP::unarmor(OpenPGP::enarmor($bytes), 'MESSAGE'));
+  }
+
+  public function testInvalidBase64() {
+    $input = OpenPGP::header('MESSAGE') . "\n\nY~WJjZAD/\n=PE3Q\n" . OpenPGP::footer('MESSAGE');
+    $this->assertEquals(false, OpenPGP::unarmor($input, 'MESSAGE'));
+  }
+}
\ No newline at end of file