diff --git a/test/Middleware/SetUpTrait.php b/test/Middleware/SetUpTrait.php
index 5f0a51c5..641d24b9 100644
--- a/test/Middleware/SetUpTrait.php
+++ b/test/Middleware/SetUpTrait.php
@@ -42,6 +42,7 @@ trait SetUpTrait
     protected RequestHandlerInterface $defaultPayloadHandler;
     protected ?ServerRequest $recentlyHandledRequest;
     protected RampageRequestHandler $handler;
+    protected Horde_Auth_Base $authDriver;
 
     protected function setUp(): void
     {
diff --git a/test/RegistryTest.php b/test/RegistryTest.php
index b9a9b14c..0a3974ad 100644
--- a/test/RegistryTest.php
+++ b/test/RegistryTest.php
@@ -28,13 +28,16 @@
  */
 class RegistryTest extends TestCase
 {
-    protected $_tmpdir;
+    protected string $_tmpdir = '';
 
     public function tearDown(): void
     {
-        if (is_dir($this->_tmpdir)) {
-            rmdir($this->_tmpdir);
-            rmdir(dirname($this->_tmpdir));
+        if ($this->_tmpdir != '') {
+            if (is_dir($this->_tmpdir)) {
+                rmdir($this->_tmpdir);
+                rmdir(dirname($this->_tmpdir));
+            }
+            $this->_tmpdir = '';
         }
     }