diff --git a/picampaign/importer/tests.py b/picampaign/importer/tests.py
index ef861e41d76bafc70db2530541d1b0d6034eede8..7d65211071239d0702989677c7bcd86fd793b2c3 100644
--- a/picampaign/importer/tests.py
+++ b/picampaign/importer/tests.py
@@ -37,7 +37,6 @@ class ImporterTest(TestCase):
             name='test importer',
             category='repr',
             campaign=self.campaign,
-            organization=self.organization
         )
         self.assertEqual(str(importer), u'%(name)s: %(format)s %(type)s importer' % {'format': importer.category,
                                                 'type': importer.kind(),
@@ -48,7 +47,6 @@ class ImporterTest(TestCase):
             name='test importer',
             category='repr',
             campaign = self.campaign,
-            organization = self.organization,
         )
         self.assertEqual(importer.kind(), None)
         importer.file = 'a'
@@ -65,7 +63,6 @@ class ImporterTest(TestCase):
             name='test importer',
             category='repr',
             campaign = self.campaign,
-            organization = self.organization,
             file=json_file
         )
         self.assertEqual(importer.kind(), 'file')
diff --git a/picampaign/settings.py.sample b/picampaign/settings.py.sample
index 104da4f98829c587adea2f9410339b28ac142b0d..90d1013f8672513e4341b153d78ec69c99eb2b38 100644
--- a/picampaign/settings.py.sample
+++ b/picampaign/settings.py.sample
@@ -104,10 +104,14 @@ TEMPLATES = [
         {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
             'APP_DIRS': True,
-            'TEMPLATE_DEBUG': False
+            'OPTIONS': {
+                'debug': DEBUG,
+            }
         },
         {
             'BACKEND': 'django.contrib.auth.context_processors.auth',
-            'TEMPLATE_DEBUG': False
+            'OPTIONS': {
+                'debug': DEBUG,
+            }
         },
     ]