diff --git a/tests/gnupgt.inc b/tests/gnupgt.inc
index 7b3363f..2d6f514 100644
--- a/tests/gnupgt.inc
+++ b/tests/gnupgt.inc
@@ -17,5 +17,16 @@ class gnupgt {
     {
         @unlink(__DIR__ . "/pubring.gpg");
         @unlink(__DIR__ . "/secring.gpg");
+        @unlink(__DIR__ . "/pubring.kbx");
+        @unlink(__DIR__ . "/random_seed");
+        @unlink(__DIR__ . "/sshcontrol");
+        @unlink(__DIR__ . "/trustdb.gpg");
+        $privKeyDir = __DIR__ . '/private-keys-v1.d';
+        if (is_dir($privKeyDir)) {
+            foreach (glob($privKeyDir . '/*.key') as $key) {
+                unlink($key);
+            }
+            rmdir($privKeyDir);
+        }
     }
 }
\ No newline at end of file