diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
index 77179fb79d..e5c24db6bf 100644
--- a/tests/staticfiles_tests/tests.py
+++ b/tests/staticfiles_tests/tests.py
@@ -279,14 +279,16 @@ class TestConfiguration(StaticFilesTestCase):
                 command = collectstatic.Command()
                 self.assertFalse(command.is_local_storage())
 
-            storage.staticfiles_storage = storage.FileSystemStorage()
+            collectstatic.staticfiles_storage = storage.FileSystemStorage()
             command = collectstatic.Command()
             self.assertTrue(command.is_local_storage())
 
-            storage.staticfiles_storage = DummyStorage()
+            collectstatic.staticfiles_storage = DummyStorage()
             command = collectstatic.Command()
             self.assertFalse(command.is_local_storage())
         finally:
+            staticfiles_storage._wrapped = empty
+            collectstatic.staticfiles_storage = staticfiles_storage
             storage.staticfiles_storage = staticfiles_storage