diff --git a/mayan/settings/testing/__init__.py b/mayan/settings/testing/__init__.py
index 90a025874c..530d26cce6 100644
--- a/mayan/settings/testing/__init__.py
+++ b/mayan/settings/testing/__init__.py
@@ -1,7 +1 @@
 from .base import *  # NOQA
-
-# Remove whitenoise from middlewares. Causes out of memory errors during test
-# suit
-MIDDLEWARE_CLASSES = [
-    cls for cls in MIDDLEWARE_CLASSES if cls !='whitenoise.middleware.WhiteNoiseMiddleware'
-]
diff --git a/mayan/settings/testing/base.py b/mayan/settings/testing/base.py
index ee8a99c22c..756a9efd1b 100644
--- a/mayan/settings/testing/base.py
+++ b/mayan/settings/testing/base.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals
 from .. import *  # NOQA
 
 INSTALLED_APPS += ('test_without_migrations',)
+INSTALLED_APPS -= ('whitenoise.runserver_nostatic',)
 
 COMMON_PRODUCTION_ERROR_LOG_PATH = '/tmp/mayan-errors.log'
 
@@ -10,3 +11,11 @@ TEMPLATES[0]['OPTIONS']['loaders'] = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
+
+# Remove whitenoise from middlewares. Causes out of memory errors during test
+# suit
+MIDDLEWARE_CLASSES = [
+    cls for cls in MIDDLEWARE_CLASSES if cls !='whitenoise.middleware.WhiteNoiseMiddleware'
+]
+
+STATICFILES_STORAGE = None