diff --git a/manage.py b/manage.py
index 6b5d019..d960e32 100755
--- a/manage.py
+++ b/manage.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 import os
 
-if os.environ.get('DJANGO_SETTINGS_MODULE') is None:
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.extend.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
 from django.core import management
 
 if __name__ == "__main__":
diff --git a/tests/extend/south_migrations/__init__.py b/tests/extend/south_migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/extend/fixtures/role.yaml b/tests/fixtures/role.yaml
similarity index 97%
rename from tests/extend/fixtures/role.yaml
rename to tests/fixtures/role.yaml
index c62a559..aeda34b 100644
--- a/tests/extend/fixtures/role.yaml
+++ b/tests/fixtures/role.yaml
@@ -94,12 +94,12 @@
     is_staff: true
 
 - pk: 1
-  model: 'extend.MyUser'
+  model: 'tests.MyUser'
   fields:
     user: 1
     role: 1
 - pk: 2
-  model: 'extend.MyUser'
+  model: 'tests.MyUser'
   fields:
     user: 2
     role: 2
diff --git a/tests/extend/migrations/0001_initial.py b/tests/migrations/0001_initial.py
similarity index 100%
rename from tests/extend/migrations/0001_initial.py
rename to tests/migrations/0001_initial.py
diff --git a/tests/extend/__init__.py b/tests/migrations/__init__.py
similarity index 100%
rename from tests/extend/__init__.py
rename to tests/migrations/__init__.py
diff --git a/tests/extend/models.py b/tests/models.py
similarity index 100%
rename from tests/extend/models.py
rename to tests/models.py
diff --git a/tests/extend/settings.py b/tests/settings.py
similarity index 95%
rename from tests/extend/settings.py
rename to tests/settings.py
index 589477b..5f6bfa3 100644
--- a/tests/extend/settings.py
+++ b/tests/settings.py
@@ -14,7 +14,7 @@
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'authrole',
-    'tests.extend',
+    'tests',
 ]
 
 TEMPLATES = [
diff --git a/tests/extend/south_migrations/0001_initial.py b/tests/south_migrations/0001_initial.py
similarity index 99%
rename from tests/extend/south_migrations/0001_initial.py
rename to tests/south_migrations/0001_initial.py
index e860f32..14631f3 100644
--- a/tests/extend/south_migrations/0001_initial.py
+++ b/tests/south_migrations/0001_initial.py
@@ -65,7 +65,7 @@ def backwards(self, orm):
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        'extend.myuser': {
+        'tests.myuser': {
             'Meta': {'object_name': 'MyUser'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'role': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'myusers'", 'to': "orm['authrole.Role']"}),
diff --git a/tests/extend/migrations/__init__.py b/tests/south_migrations/__init__.py
similarity index 100%
rename from tests/extend/migrations/__init__.py
rename to tests/south_migrations/__init__.py
diff --git a/tests/extend/tests.py b/tests/tests.py
similarity index 100%
rename from tests/extend/tests.py
rename to tests/tests.py