diff --git a/settings/common.py b/settings/common.py
index a2caa07c..c54b851d 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -171,7 +171,6 @@ INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.staticfiles",
 
-    "taiga.base.notifications",
     "taiga.base",
     "taiga.base.searches",
     "taiga.events",
@@ -179,13 +178,14 @@ INSTALLED_APPS = [
     "taiga.front",
     "taiga.users",
     "taiga.projects",
-    "taiga.projects.mixins.blocked",
+    "taiga.projects.attachments",
     "taiga.projects.milestones",
     "taiga.projects.userstories",
     "taiga.projects.tasks",
     "taiga.projects.issues",
     "taiga.projects.wiki",
     "taiga.projects.history",
+    "taiga.projects.notifications",
 
     "south",
     "reversion",
diff --git a/settings/testing.py b/settings/testing.py
index 4b52a005..c34bdfe4 100644
--- a/settings/testing.py
+++ b/settings/testing.py
@@ -20,5 +20,5 @@ SKIP_SOUTH_TESTS = True
 SOUTH_TESTS_MIGRATE = False
 
 INSTALLED_APPS += [
-    "taiga.projects.mixins.blocked.tests.foo",
+    "taiga.projects.mixins.tests.blocked.foo",
 ]