diff --git a/system/api_lib.py b/system/api_lib.py
index 51c21b40..a41161ea 100644
--- a/system/api_lib.py
+++ b/system/api_lib.py
@@ -55,6 +55,8 @@ class APITest(BaseTest):
         if os.path.exists(os.path.join(os.environ["HOME"], self.aptlyDir, "upload")):
             shutil.rmtree(os.path.join(os.environ["HOME"], self.aptlyDir, "upload"))
 
+        self.prepare_fixture()
+
     def debug_output(self):
         return APITest.aptly_out.get_contents()
 
diff --git a/system/lib.py b/system/lib.py
index 0b170b64..e162b964 100644
--- a/system/lib.py
+++ b/system/lib.py
@@ -267,7 +267,7 @@ class BaseTest(object):
             self.webServerUrl = self.start_webserver(os.path.join(os.path.dirname(inspect.getsourcefile(self.__class__)),
                                                                   self.fixtureWebServer))
 
-        if self.requiresGPG2:
+        if self.requiresGPG2 or self.gpgFinder.gpg2:
             self.run_cmd([
                 self.gpgFinder.gpg2, "--import",
                 os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files") + "/aptly.sec"], expected_code=None)
diff --git a/system/t12_api/gpg.py b/system/t12_api/gpg.py
index 363e198e..305a2b7e 100644
--- a/system/t12_api/gpg.py
+++ b/system/t12_api/gpg.py
@@ -2,6 +2,7 @@ import inspect
 import os
 import subprocess
 import tempfile
+import json
 
 from api_lib import APITest
 
@@ -25,6 +26,12 @@ class GPGAPITestAddKey(APITest):
     """
     requiresGPG2 = True
 
+    fixtureCmds = [
+        "gpgconf --kill dirmngr",
+        "gpgconf --launch dirmngr",
+        "sleep 2"
+    ]
+
     def check(self):
         with tempfile.NamedTemporaryFile(suffix=".pub") as keyring:
             gpgkeyid = "9E3E53F19C7DE460"
@@ -33,7 +40,9 @@ class GPGAPITestAddKey(APITest):
                 "Keyring": keyring.name,
                 "GpgKeyID": gpgkeyid
             })
-
+            if resp.status_code != 200:
+                output = json.loads(resp.text)
+                print(f"{output}\n")
             self.check_equal(resp.status_code, 200)
             check_gpgkey_exists(gpgkeyid, keyring.name)