diff --git a/runtests.py b/runtests.py
index b49d38c..74c8619 100755
--- a/runtests.py
+++ b/runtests.py
@@ -5,19 +5,18 @@ import os, sys
 from django.conf import settings
 import django
 
-
 DEFAULT_SETTINGS = dict(
     INSTALLED_APPS=(
         'model_utils',
-        'model_utils.tests',
-        ),
+        'tests',
+    ),
     DATABASES={
         "default": {
             "ENGINE": "django.db.backends.sqlite3"
-            }
-        },
+        }
+    },
     SILENCED_SYSTEM_CHECKS=["1_7.W001"],
-    )
+)
 
 
 def runtests():
@@ -31,7 +30,7 @@ def runtests():
 
     from django.test.runner import DiscoverRunner
     runner_class = DiscoverRunner
-    test_args = ['model_utils.tests']
+    test_args = ['tests']
 
     failures = runner_class(
         verbosity=1, interactive=True, failfast=False).run_tests(test_args)
diff --git a/setup.py b/setup.py
index 65b7641..04c4d95 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ setup(
     author='Carl Meyer',
     author_email='carl@oddbird.net',
     url='https://github.com/carljm/django-model-utils/',
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests*']),
     install_requires=['Django>=1.8'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -39,7 +39,6 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
@@ -49,7 +48,6 @@ setup(
     ],
     zip_safe=False,
     tests_require=['Django>=1.8'],
-    test_suite='runtests.runtests',
     package_data={
         'model_utils': [
             'locale/*/LC_MESSAGES/django.po','locale/*/LC_MESSAGES/django.mo'
diff --git a/model_utils/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from model_utils/tests/__init__.py
rename to tests/__init__.py
diff --git a/model_utils/tests/fields.py b/tests/fields.py
similarity index 100%
rename from model_utils/tests/fields.py
rename to tests/fields.py
diff --git a/model_utils/tests/managers.py b/tests/managers.py
similarity index 100%
rename from model_utils/tests/managers.py
rename to tests/managers.py
diff --git a/model_utils/tests/models.py b/tests/models.py
similarity index 98%
rename from model_utils/tests/models.py
rename to tests/models.py
index db13413..a65d499 100644
--- a/model_utils/tests/models.py
+++ b/tests/models.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import
 
 from django.db import models
 from django.db.models import Manager
@@ -14,8 +14,8 @@ from model_utils.models import (
     TimeFramedModel,
     TimeStampedModel,
 )
-from model_utils.tests.fields import MutableField
-from model_utils.tests.managers import CustomSoftDeleteManager
+from tests.fields import MutableField
+from tests.managers import CustomSoftDeleteManager
 from model_utils.tracker import FieldTracker, ModelTracker
 
 
diff --git a/model_utils/tests/test_choices.py b/tests/test_choices.py
similarity index 100%
rename from model_utils/tests/test_choices.py
rename to tests/test_choices.py
diff --git a/model_utils/tests/test_fields/__init__.py b/tests/test_fields/__init__.py
similarity index 100%
rename from model_utils/tests/test_fields/__init__.py
rename to tests/test_fields/__init__.py
diff --git a/model_utils/tests/test_fields/test_field_tracker.py b/tests/test_fields/test_field_tracker.py
similarity index 99%
rename from model_utils/tests/test_fields/test_field_tracker.py
rename to tests/test_fields/test_field_tracker.py
index 8d6641c..00c28b3 100644
--- a/model_utils/tests/test_fields/test_field_tracker.py
+++ b/tests/test_fields/test_field_tracker.py
@@ -7,7 +7,7 @@ from django.core.exceptions import FieldError
 from django.test import TestCase
 
 from model_utils import FieldTracker
-from model_utils.tests.models import (
+from tests.models import (
     Tracked, TrackedFK, InheritedTrackedFK, TrackedNotDefault, TrackedNonFieldAttr, TrackedMultiple,
     InheritedTracked, TrackedFileField,
     ModelTracked, ModelTrackedFK, ModelTrackedNotDefault, ModelTrackedMultiple, InheritedModelTracked,
diff --git a/model_utils/tests/test_fields/test_monitor_field.py b/tests/test_fields/test_monitor_field.py
similarity index 97%
rename from model_utils/tests/test_fields/test_monitor_field.py
rename to tests/test_fields/test_monitor_field.py
index 779f502..6c5792e 100644
--- a/model_utils/tests/test_fields/test_monitor_field.py
+++ b/tests/test_fields/test_monitor_field.py
@@ -7,7 +7,7 @@ from freezegun import freeze_time
 from django.test import TestCase
 
 from model_utils.fields import MonitorField
-from model_utils.tests.models import Monitored, MonitorWhen, MonitorWhenEmpty, DoubleMonitored
+from tests.models import Monitored, MonitorWhen, MonitorWhenEmpty, DoubleMonitored
 
 
 class MonitorFieldTests(TestCase):
diff --git a/model_utils/tests/test_fields/test_split_field.py b/tests/test_fields/test_split_field.py
similarity index 97%
rename from model_utils/tests/test_fields/test_split_field.py
rename to tests/test_fields/test_split_field.py
index 57802fd..dfde85f 100644
--- a/model_utils/tests/test_fields/test_split_field.py
+++ b/tests/test_fields/test_split_field.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.utils.six import text_type
 from django.test import TestCase
 
-from model_utils.tests.models import Article, SplitFieldAbstractParent
+from tests.models import Article, SplitFieldAbstractParent
 
 
 class SplitFieldTests(TestCase):
diff --git a/model_utils/tests/test_fields/test_status_field.py b/tests/test_fields/test_status_field.py
similarity index 96%
rename from model_utils/tests/test_fields/test_status_field.py
rename to tests/test_fields/test_status_field.py
index 73dabac..5f077da 100644
--- a/model_utils/tests/test_fields/test_status_field.py
+++ b/tests/test_fields/test_status_field.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.test import TestCase
 
 from model_utils.fields import StatusField
-from model_utils.tests.models import (
+from tests.models import (
     Article, StatusFieldDefaultFilled, StatusFieldDefaultNotFilled,
     StatusFieldChoicesName,
     )
diff --git a/model_utils/tests/test_managers/__init__.py b/tests/test_managers/__init__.py
similarity index 100%
rename from model_utils/tests/test_managers/__init__.py
rename to tests/test_managers/__init__.py
diff --git a/model_utils/tests/test_managers/test_inheritance_manager.py b/tests/test_managers/test_inheritance_manager.py
similarity index 99%
rename from model_utils/tests/test_managers/test_inheritance_manager.py
rename to tests/test_managers/test_inheritance_manager.py
index 0c2b91d..4509175 100644
--- a/model_utils/tests/test_managers/test_inheritance_manager.py
+++ b/tests/test_managers/test_inheritance_manager.py
@@ -6,7 +6,7 @@ import django
 from django.db import models
 from django.test import TestCase
 
-from model_utils.tests.models import (InheritanceManagerTestRelated, InheritanceManagerTestGrandChild1,
+from tests.models import (InheritanceManagerTestRelated, InheritanceManagerTestGrandChild1,
                                       InheritanceManagerTestGrandChild1_2, InheritanceManagerTestParent,
                                       InheritanceManagerTestChild1,
                                       InheritanceManagerTestChild2, TimeFrame, InheritanceManagerTestChild3
diff --git a/model_utils/tests/test_managers/test_query_manager.py b/tests/test_managers/test_query_manager.py
similarity index 95%
rename from model_utils/tests/test_managers/test_query_manager.py
rename to tests/test_managers/test_query_manager.py
index 70f2f46..dd539b6 100644
--- a/model_utils/tests/test_managers/test_query_manager.py
+++ b/tests/test_managers/test_query_manager.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.test import TestCase
 
-from model_utils.tests.models import Post
+from tests.models import Post
 
 
 class QueryManagerTests(TestCase):
diff --git a/model_utils/tests/test_managers/test_softdelete_manager.py b/tests/test_managers/test_softdelete_manager.py
similarity index 94%
rename from model_utils/tests/test_managers/test_softdelete_manager.py
rename to tests/test_managers/test_softdelete_manager.py
index 3f5ed47..4ae5475 100644
--- a/model_utils/tests/test_managers/test_softdelete_manager.py
+++ b/tests/test_managers/test_softdelete_manager.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.test import TestCase
 
-from model_utils.tests.models import CustomSoftDelete
+from tests.models import CustomSoftDelete
 
 
 class CustomSoftDeleteManagerTests(TestCase):
diff --git a/model_utils/tests/test_managers/test_status_manager.py b/tests/test_managers/test_status_manager.py
similarity index 92%
rename from model_utils/tests/test_managers/test_status_manager.py
rename to tests/test_managers/test_status_manager.py
index af3d7cb..593a547 100644
--- a/model_utils/tests/test_managers/test_status_manager.py
+++ b/tests/test_managers/test_status_manager.py
@@ -6,7 +6,7 @@ from django.test import TestCase
 
 from model_utils.managers import QueryManager
 from model_utils.models import StatusModel
-from model_utils.tests.models import StatusManagerAdded
+from tests.models import StatusManagerAdded
 
 
 class StatusManagerAddedTests(TestCase):
diff --git a/model_utils/tests/test_miscellaneous.py b/tests/test_miscellaneous.py
similarity index 100%
rename from model_utils/tests/test_miscellaneous.py
rename to tests/test_miscellaneous.py
diff --git a/model_utils/tests/test_models/__init__.py b/tests/test_models/__init__.py
similarity index 100%
rename from model_utils/tests/test_models/__init__.py
rename to tests/test_models/__init__.py
diff --git a/model_utils/tests/test_models/test_softdeletable_model.py b/tests/test_models/test_softdeletable_model.py
similarity index 97%
rename from model_utils/tests/test_models/test_softdeletable_model.py
rename to tests/test_models/test_softdeletable_model.py
index fb05e08..5f06fd3 100644
--- a/model_utils/tests/test_models/test_softdeletable_model.py
+++ b/tests/test_models/test_softdeletable_model.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.db.utils import ConnectionDoesNotExist
 from django.test import TestCase
 
-from model_utils.tests.models import SoftDeletable
+from tests.models import SoftDeletable
 
 
 class SoftDeletableModelTests(TestCase):
diff --git a/model_utils/tests/test_models/test_status_model.py b/tests/test_models/test_status_model.py
similarity index 97%
rename from model_utils/tests/test_models/test_status_model.py
rename to tests/test_models/test_status_model.py
index 6ab7e9b..724ba26 100644
--- a/model_utils/tests/test_models/test_status_model.py
+++ b/tests/test_models/test_status_model.py
@@ -4,7 +4,7 @@ from freezegun import freeze_time
 
 from django.test.testcases import TestCase
 
-from model_utils.tests.models import Status, StatusPlainTuple, StatusCustomManager
+from tests.models import Status, StatusPlainTuple, StatusCustomManager
 
 
 class StatusModelTests(TestCase):
diff --git a/model_utils/tests/test_models/test_timeframed_model.py b/tests/test_models/test_timeframed_model.py
similarity index 95%
rename from model_utils/tests/test_models/test_timeframed_model.py
rename to tests/test_models/test_timeframed_model.py
index 993a339..dccc5a7 100644
--- a/model_utils/tests/test_models/test_timeframed_model.py
+++ b/tests/test_models/test_timeframed_model.py
@@ -8,7 +8,7 @@ from django.test import TestCase
 
 from model_utils.managers import QueryManager
 from model_utils.models import TimeFramedModel
-from model_utils.tests.models import TimeFrame, TimeFrameManagerAdded
+from tests.models import TimeFrame, TimeFrameManagerAdded
 
 
 class TimeFramedModelTests(TestCase):
diff --git a/model_utils/tests/test_models/test_timestamped_model.py b/tests/test_models/test_timestamped_model.py
similarity index 92%
rename from model_utils/tests/test_models/test_timestamped_model.py
rename to tests/test_models/test_timestamped_model.py
index 221d682..8760411 100644
--- a/model_utils/tests/test_models/test_timestamped_model.py
+++ b/tests/test_models/test_timestamped_model.py
@@ -6,7 +6,7 @@ from freezegun import freeze_time
 
 from django.test import TestCase
 
-from model_utils.tests.models import TimeStamp
+from tests.models import TimeStamp
 
 
 class TimeStampedModelTests(TestCase):
diff --git a/tox.ini b/tox.ini
index 089f211..3705195 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,4 +20,4 @@ deps =
     django_trunk: https://github.com/django/django/tarball/master
     freezegun == 0.3.8
 
-commands = coverage run -a setup.py test
+commands = coverage run runtests.py
diff --git a/translations.py b/translations.py
index 58b107f..8eebf95 100755
--- a/translations.py
+++ b/translations.py
@@ -1,24 +1,22 @@
 #!/usr/bin/env python
-
 import os
 import sys
 
 from django.conf import settings
 import django
 
-
 DEFAULT_SETTINGS = dict(
     INSTALLED_APPS=(
         'model_utils',
-        'model_utils.tests',
-        ),
+        'tests',
+    ),
     DATABASES={
         "default": {
             "ENGINE": "django.db.backends.sqlite3"
-            }
-        },
+        }
+    },
     SILENCED_SYSTEM_CHECKS=["1_7.W001"],
-    )
+)
 
 
 def run(command):