diff --git a/apps/encryption/tests/Command/FixEncryptedVersionTest.php b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
index dcbbe3c478b8..ad46dbfa89ee 100644
--- a/apps/encryption/tests/Command/FixEncryptedVersionTest.php
+++ b/apps/encryption/tests/Command/FixEncryptedVersionTest.php
@@ -22,6 +22,7 @@
 namespace OCA\Encryption\Tests\Command;
 
 use OC\Files\Cache\Cache;
+use OC\Files\Filesystem;
 use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\View;
 use OCA\Encryption\AppInfo\Application;
@@ -96,6 +97,7 @@ public static function tearDownAfterClass() {
 		\OC::$server->getConfig()->deleteAppValue('core', 'encryption_enabled');
 		\OC::$server->getConfig()->deleteAppValue('core', 'default_encryption_module');
 		\OC::$server->getConfig()->deleteAppValues('encryption');
+		Filesystem::getLoader()->removeStorageWrapper("oc_encryption");
 	}
 
 	public function setUp() {
@@ -155,7 +157,7 @@ public function testEncryptedVersionZero() {
 ", $output);
 		/**
 		 * We need to add ob_start at the end because if not done, it would be considered as a risky test.
-		 * The reason is outputBufferingLevel in phpunit/src/Framework/TestcCase.php is found to be 1
+		 * The reason is outputBufferingLevel in phpunit/src/Framework/TestCase.php is found to be 1
 		 * where as the ob_get_level is found to be zero.
 		 */
 		\ob_start();
@@ -230,7 +232,7 @@ public function testEncryptedVersionLessThanOriginalValue() {
 ", $output);
 		/**
 		 * We need to add ob_start at the end because if not done, it would be considered as a risky test.
-		 * The reason is outputBufferingLevel in phpunit/src/Framework/TestcCase.php is found to be 1
+		 * The reason is outputBufferingLevel in phpunit/src/Framework/TestCase.php is found to be 1
 		 * where as the ob_get_level is found to be zero.
 		 */
 		\ob_start();
@@ -306,7 +308,7 @@ public function testEncryptedVersionGreaterThanOriginalValue() {
 ", $output);
 		/**
 		 * We need to add ob_start at the end because if not done, it would be considered as a risky test.
-		 * The reason is outputBufferingLevel in phpunit/src/Framework/TestcCase.php is found to be 1
+		 * The reason is outputBufferingLevel in phpunit/src/Framework/TestCase.php is found to be 1
 		 * where as the ob_get_level is found to be zero.
 		 */
 		\ob_start();