diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index 4b4497a070bfa..635813f557a3d 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -94,7 +94,9 @@ public function restoreService(string $name): bool {
 					return $oldService;
 				});
 			} else {
-				unset($container[$oldService]);
+				// The service was not registered before the test override.
+				// Remove the test registration so the container returns to its prior state.
+				unset($container[$name]);
 			}