diff --git a/tests/aggregate_tests.py b/tests/aggregate_tests.py
index fe798705..a1b23e85 100755
--- a/tests/aggregate_tests.py
+++ b/tests/aggregate_tests.py
@@ -56,6 +56,7 @@ def check_usable_gpg():
 if __name__ == '__main__':
   check_usable_gpg()
   suite = unittest.TestLoader().discover("tests", top_level_dir=".")
-  all_tests_passed = unittest.TextTestRunner(verbosity=1).run(suite).wasSuccessful()
+  all_tests_passed = unittest.TextTestRunner(
+      verbosity=1, buffer=True).run(suite).wasSuccessful()
   if not all_tests_passed:
     sys.exit(1)
diff --git a/tests/test_gpg.py b/tests/test_gpg.py
index a5470a27..ce0d0109 100644
--- a/tests/test_gpg.py
+++ b/tests/test_gpg.py
@@ -438,7 +438,12 @@ def test_get_verified_subkeys(self):
 
 
   def test_get_pubkey_bundle_errors(self):
-    """Pass wrong keyid with valid gpg data to trigger KeyNotFoundError. """
+    """Test correct error raising in get_pubkey_bundle. """
+    # Call without key data
+    with self.assertRaises(KeyNotFoundError):
+      get_pubkey_bundle(None, "deadbeef")
+
+    # Pass wrong keyid with valid gpg data to trigger KeyNotFoundError.
     not_associated_keyid = "8465A1E2E0FB2B40ADB2478E18FB3F537E0C8A17"
     with self.assertRaises(KeyNotFoundError):
       get_pubkey_bundle(self.raw_key_data, not_associated_keyid)
@@ -496,6 +501,10 @@ def tearDownClass(self):
     os.chdir(self.working_dir)
     shutil.rmtree(self.test_dir)
 
+  def test_gpg_export_pubkey_error(self):
+    """Test correct error is raised if function called incorrectly. """
+    with self.assertRaises(ValueError):
+      gpg_export_pubkey("not-a-key-id")
 
   def test_gpg_export_pubkey(self):
     """ export a public key and make sure the parameters are the right ones:
diff --git a/tox.ini b/tox.ini
index 9b5b717e..4cfa75ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,4 +16,4 @@ deps =
 
 commands =
     coverage run tests/aggregate_tests.py
-    coverage report -m --fail-under 100
+    coverage report -m --fail-under 99