diff --git a/lib/SimpleSAML/Store/StoreFactory.php b/lib/SimpleSAML/Store/StoreFactory.php
index d3b0f49cc2976666e01e6a92ee06368f019d3806..f3aa7ea764ece59d0ce3e8d8aad35e7ffc25dab1 100644
--- a/lib/SimpleSAML/Store/StoreFactory.php
+++ b/lib/SimpleSAML/Store/StoreFactory.php
@@ -70,7 +70,7 @@ abstract class StoreFactory implements Utils\ClearableState
                         $c
                     );
                 }
-                /** @var \SimpleSAML\Store|false */
+                /** @var \SimpleSAML\Store\StoreInterface|false */
                 self::$instance = new $className();
         }
 
diff --git a/tests/lib/SimpleSAML/Store/RedisStoreTest.php b/tests/lib/SimpleSAML/Store/RedisStoreTest.php
index 1a149e27d5d2e94f273173bee4438ce20e5e0962..94b5560a23257e844bcaf79007dfa6baa9447c23 100644
--- a/tests/lib/SimpleSAML/Store/RedisStoreTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisStoreTest.php
@@ -112,7 +112,6 @@ class RedisStoreTest extends TestCase
         ], '[ARRAY]', 'simplesaml');
 
         $this->assertInstanceOf(Store\RedisStore::class, $this->store);
-        $this->clearInstance($config, Configuration::class);
     }
 
 
@@ -128,7 +127,6 @@ class RedisStoreTest extends TestCase
         ], '[ARRAY]', 'simplesaml');
 
         $this->assertInstanceOf(Store\RedisStore::class, $this->store);
-        $this->clearInstance($config, Configuration::class);
     }
 
 
@@ -201,18 +199,4 @@ class RedisStoreTest extends TestCase
 
         $this->assertNull($res);
     }
-
-
-    /**
-     * @param \SimpleSAML\Configuration $service
-     * @param class-string $className
-     */
-    protected function clearInstance(Configuration $service, string $className): void
-    {
-        $reflectedClass = new ReflectionClass($className);
-        $reflectedInstance = $reflectedClass->getProperty('instance');
-        $reflectedInstance->setAccessible(true);
-        $reflectedInstance->setValue($service, []);
-        $reflectedInstance->setAccessible(false);
-    }
 }
diff --git a/tests/lib/SimpleSAML/Store/SQLStoreTest.php b/tests/lib/SimpleSAML/Store/SQLStoreTest.php
index 675e112aec622e9d827c9c69c6f442a9e089d077..b6166ae3fabcc1aff148589463a25eaff02b2256 100644
--- a/tests/lib/SimpleSAML/Store/SQLStoreTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLStoreTest.php
@@ -144,26 +144,4 @@ class SQLStoreTest extends TestCase
 
         $this->assertNull($value);
     }
-
-
-    /**
-     */
-    protected function tearDown(): void
-    {
-        $this->clearInstance(Configuration::getInstance(), Configuration::class);
-    }
-
-
-    /**
-     * @param \SimpleSAML\Configuration $service
-     * @param class-string $className
-     */
-    protected function clearInstance(Configuration $service, string $className): void
-    {
-        $reflectedClass = new ReflectionClass($className);
-        $reflectedInstance = $reflectedClass->getProperty('instance');
-        $reflectedInstance->setAccessible(true);
-        $reflectedInstance->setValue($service, []);
-        $reflectedInstance->setAccessible(false);
-    }
 }