1 files changed, 7 insertions, 4 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 183a2f682..0b466c48c 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -25,6 +25,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.urlresolvers import reverse
 from django.test.client import Client
 
+from django.contrib.auth.models import User
 from django.contrib.auth.models import Permission
 import models
 
@@ -593,11 +594,13 @@ def create_operation(user, orga=None, values={}):
 class OperationInitTest(object):
     def create_user(self):
         username, password, self.user = create_user()
+        return self.user
 
     def get_default_user(self):
-        if not hasattr(self, 'user') or not self.user:
-            self.create_user()
-        return self.user
+        q = User.objects.filter(is_superuser=False)
+        if q.count():
+            return q.all()[0]
+        return self.create_user()
 
     def create_orgas(self, user=None):
         if not user:
@@ -1266,7 +1269,7 @@ class OperationWizardDeleteTest(OperationWizardCreationTest):
     ]
 
     def pass_test(self):
-        if not settings.SOUTH_TESTS_MIGRATE:
+        if not settings.TEST_VIEWS:
             # with no migration the views are not created
             return True