diff --git a/.travis.yml b/.travis.yml
index 094c279..bd862c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - 3.3
 install:
   - pip install -e .
-  - pip install -r requirements/tests.txt
+  - pip install -r tests/requirements.txt
   - pip install https://github.com/django/django/archive/${DJANGO}.zip#egg=django
 script:
   - inv test
diff --git a/MANIFEST.in b/MANIFEST.in
index e7f8d97..372baba 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,8 @@
 include README.rst
 include CHANGES.rst
+include AUTHORS
 include .travis.yml
 include manage.py
 include tasks.py
-include requirements/tests.txt
+recursive-include tests *
 recursive-include docs *
diff --git a/configurations/__init__.py b/configurations/__init__.py
index ff48e78..8aefa47 100644
--- a/configurations/__init__.py
+++ b/configurations/__init__.py
@@ -2,5 +2,5 @@
 from .base import Settings, Configuration
 from .decorators import pristinemethod
 
-__version__ = '0.4'
+__version__ = '0.5'
 __all__ = ['Configuration', 'pristinemethod', 'Settings']
diff --git a/configurations/tests/test_inheritance.py b/configurations/tests/test_inheritance.py
deleted file mode 100644
index adb88d9..0000000
--- a/configurations/tests/test_inheritance.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-
-from django.conf import global_settings
-from django.test import TestCase
-
-from mock import patch
-
-
-class InheritanceTests(TestCase):
-
-    @patch.dict(os.environ, clear=True,
-                DJANGO_CONFIGURATION='Inheritance',
-                DJANGO_SETTINGS_MODULE='configurations.tests.settings.single_inheritance')
-    def test_inherited(self):
-        from configurations.tests.settings import single_inheritance
-        self.assertEqual(single_inheritance.TEMPLATE_CONTEXT_PROCESSORS,
-                          global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
-                              'configurations.tests.settings.base.test_callback',
-                          ))
-
-    @patch.dict(os.environ, clear=True,
-                DJANGO_CONFIGURATION='Inheritance',
-                DJANGO_SETTINGS_MODULE='configurations.tests.settings.multiple_inheritance')
-    def test_inherited2(self):
-        from configurations.tests.settings import multiple_inheritance
-        self.assertEqual(multiple_inheritance.TEMPLATE_CONTEXT_PROCESSORS,
-                          global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
-                              'configurations.tests.settings.base.test_callback',
-                              'configurations.tests.settings.base.test_callback',
-                          ))
-
-    @patch.dict(os.environ, clear=True,
-                DJANGO_CONFIGURATION='Inheritance',
-                DJANGO_SETTINGS_MODULE='configurations.tests.settings.mixin_inheritance')
-    def test_inherited3(self):
-        from configurations.tests.settings import mixin_inheritance
-        self.assertEqual(mixin_inheritance.TEMPLATE_CONTEXT_PROCESSORS,
-                          global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
-                              'some_app.context_processors.processor1',
-                              'some_app.context_processors.processor2',
-                              'some_app.context_processors.processorbase',
-                          ))
diff --git a/manage.py b/manage.py
index 6d47d54..3dd6dcb 100755
--- a/manage.py
+++ b/manage.py
@@ -3,8 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                          'configurations.tests.settings.main')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tests.settings.main')
     os.environ.setdefault('DJANGO_CONFIGURATION', 'Test')
 
     from configurations.management import execute_from_command_line
diff --git a/tasks.py b/tasks.py
index 7b4c684..aa91a58 100644
--- a/tasks.py
+++ b/tasks.py
@@ -2,7 +2,7 @@ from invoke import run, task
 
 
 @task
-def test(label='configurations'):
+def test(label='tests'):
     run('flake8 configurations --ignore=E501,E127,E128,E124')
     run('./manage.py test {0} -v2'.format(label))
 
diff --git a/configurations/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from configurations/tests/__init__.py
rename to tests/__init__.py
diff --git a/requirements/tests.txt b/tests/requirements.txt
similarity index 100%
rename from requirements/tests.txt
rename to tests/requirements.txt
diff --git a/configurations/tests/settings/__init__.py b/tests/settings/__init__.py
similarity index 100%
rename from configurations/tests/settings/__init__.py
rename to tests/settings/__init__.py
diff --git a/configurations/tests/settings/base.py b/tests/settings/base.py
similarity index 100%
rename from configurations/tests/settings/base.py
rename to tests/settings/base.py
diff --git a/configurations/tests/settings/main.py b/tests/settings/main.py
similarity index 89%
rename from configurations/tests/settings/main.py
rename to tests/settings/main.py
index e95f99b..dd425fd 100644
--- a/configurations/tests/settings/main.py
+++ b/tests/settings/main.py
@@ -25,17 +25,18 @@ class Test(Configuration):
         'django.contrib.sites',
         'django.contrib.auth',
         'django.contrib.admin',
-        'configurations.tests',
+        'tests',
     ]
 
-    ROOT_URLCONF = 'configurations.tests.urls'
+    ROOT_URLCONF = 'tests.urls'
 
     if django.VERSION[:2] < (1, 6):
         TEST_RUNNER = 'discover_runner.DiscoverRunner'
 
     def TEMPLATE_CONTEXT_PROCESSORS(self):
         return Configuration.TEMPLATE_CONTEXT_PROCESSORS + (
-            'configurations.tests.settings.base.test_callback',)
+            'tests.settings.base.test_callback',
+        )
 
     ATTRIBUTE_SETTING = True
 
diff --git a/configurations/tests/settings/mixin_inheritance.py b/tests/settings/mixin_inheritance.py
similarity index 100%
rename from configurations/tests/settings/mixin_inheritance.py
rename to tests/settings/mixin_inheritance.py
diff --git a/configurations/tests/settings/multiple_inheritance.py b/tests/settings/multiple_inheritance.py
similarity index 72%
rename from configurations/tests/settings/multiple_inheritance.py
rename to tests/settings/multiple_inheritance.py
index 9f07169..39f07f2 100644
--- a/configurations/tests/settings/multiple_inheritance.py
+++ b/tests/settings/multiple_inheritance.py
@@ -5,4 +5,4 @@ class Inheritance(Test):
 
     def TEMPLATE_CONTEXT_PROCESSORS(self):
         return super(Inheritance, self).TEMPLATE_CONTEXT_PROCESSORS() + (
-            'configurations.tests.settings.base.test_callback',)
+            'tests.settings.base.test_callback',)
diff --git a/configurations/tests/settings/single_inheritance.py b/tests/settings/single_inheritance.py
similarity index 71%
rename from configurations/tests/settings/single_inheritance.py
rename to tests/settings/single_inheritance.py
index 1ce0bda..70f9a81 100644
--- a/configurations/tests/settings/single_inheritance.py
+++ b/tests/settings/single_inheritance.py
@@ -5,4 +5,4 @@ class Inheritance(Base):
 
     def TEMPLATE_CONTEXT_PROCESSORS(self):
         return super(Inheritance, self).TEMPLATE_CONTEXT_PROCESSORS + (
-            'configurations.tests.settings.base.test_callback',)
+            'tests.settings.base.test_callback',)
diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py
new file mode 100644
index 0000000..f5e76a9
--- /dev/null
+++ b/tests/test_inheritance.py
@@ -0,0 +1,42 @@
+import os
+
+from django.conf import global_settings
+from django.test import TestCase
+
+from mock import patch
+
+
+class InheritanceTests(TestCase):
+
+    @patch.dict(os.environ, clear=True,
+                DJANGO_CONFIGURATION='Inheritance',
+                DJANGO_SETTINGS_MODULE='tests.settings.single_inheritance')
+    def test_inherited(self):
+        from tests.settings import single_inheritance
+        self.assertEqual(single_inheritance.TEMPLATE_CONTEXT_PROCESSORS,
+                         global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+                             'tests.settings.base.test_callback',
+                         ))
+
+    @patch.dict(os.environ, clear=True,
+                DJANGO_CONFIGURATION='Inheritance',
+                DJANGO_SETTINGS_MODULE='tests.settings.multiple_inheritance')
+    def test_inherited2(self):
+        from tests.settings import multiple_inheritance
+        self.assertEqual(multiple_inheritance.TEMPLATE_CONTEXT_PROCESSORS,
+                         global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+                             'tests.settings.base.test_callback',
+                             'tests.settings.base.test_callback',
+                         ))
+
+    @patch.dict(os.environ, clear=True,
+                DJANGO_CONFIGURATION='Inheritance',
+                DJANGO_SETTINGS_MODULE='tests.settings.mixin_inheritance')
+    def test_inherited3(self):
+        from tests.settings import mixin_inheritance
+        self.assertEqual(mixin_inheritance.TEMPLATE_CONTEXT_PROCESSORS,
+                         global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+                             'some_app.context_processors.processor1',
+                             'some_app.context_processors.processor2',
+                             'some_app.context_processors.processorbase',
+                         ))
diff --git a/configurations/tests/test_main.py b/tests/test_main.py
similarity index 76%
rename from configurations/tests/test_main.py
rename to tests/test_main.py
index f32be2a..0de1cc7 100644
--- a/configurations/tests/test_main.py
+++ b/tests/test_main.py
@@ -12,7 +12,7 @@ from configurations.importer import ConfigurationImporter
 class MainTests(TestCase):
 
     def test_simple(self):
-        from configurations.tests.settings import main
+        from tests.settings import main
         self.assertEqual(main.ATTRIBUTE_SETTING, True)
         self.assertEqual(main.PROPERTY_SETTING, 1)
         self.assertEqual(main.METHOD_SETTING, 2)
@@ -23,7 +23,7 @@ class MainTests(TestCase):
         self.assertTrue(lambda: callable(main.PRISTINE_FUNCTION_SETTING))
         self.assertEqual(main.TEMPLATE_CONTEXT_PROCESSORS,
                          global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
-                             'configurations.tests.settings.base.test_callback',
+                             'tests.settings.base.test_callback',
                          ))
         self.assertEqual(main.PRE_SETUP_TEST_SETTING, 6)
         self.assertRaises(AttributeError, lambda: main.POST_SETUP_TEST_SETTING)
@@ -44,36 +44,37 @@ class MainTests(TestCase):
         self.assertRaises(ImproperlyConfigured, ConfigurationImporter)
 
     @patch.dict(os.environ, clear=True,
-                DJANGO_SETTINGS_MODULE='configurations.tests.settings.main')
+                DJANGO_SETTINGS_MODULE='tests.settings.main')
     def test_empty_class_var(self):
         self.assertRaises(ImproperlyConfigured, ConfigurationImporter)
 
     def test_global_settings(self):
         from configurations.base import Configuration
-        self.assertEqual(Configuration.LOGGING_CONFIG, 'django.utils.log.dictConfig')
+        self.assertEqual(Configuration.LOGGING_CONFIG,
+                         'django.utils.log.dictConfig')
         self.assertEqual(repr(Configuration),
                          "<Configuration 'configurations.base.Configuration'>")
 
     def test_repr(self):
-        from configurations.tests.settings.main import Test
+        from tests.settings.main import Test
         self.assertEqual(repr(Test),
-                         "<Configuration 'configurations.tests.settings.main.Test'>")
+                         "<Configuration 'tests.settings.main.Test'>")
 
     @patch.dict(os.environ, clear=True,
-                DJANGO_SETTINGS_MODULE='configurations.tests.settings.main',
+                DJANGO_SETTINGS_MODULE='tests.settings.main',
                 DJANGO_CONFIGURATION='Test')
     def test_initialization(self):
         importer = ConfigurationImporter()
-        self.assertEqual(importer.module, 'configurations.tests.settings.main')
+        self.assertEqual(importer.module, 'tests.settings.main')
         self.assertEqual(importer.name, 'Test')
         self.assertEqual(repr(importer),
-                         "<ConfigurationImporter for 'configurations.tests.settings.main.Test'>")
+                         "<ConfigurationImporter for 'tests.settings.main.Test'>")
 
     @patch.dict(os.environ, clear=True,
-                DJANGO_SETTINGS_MODULE='configurations.tests.settings.inheritance',
+                DJANGO_SETTINGS_MODULE='tests.settings.inheritance',
                 DJANGO_CONFIGURATION='Inheritance')
     def test_initialization_inheritance(self):
         importer = ConfigurationImporter()
         self.assertEqual(importer.module,
-                         'configurations.tests.settings.inheritance')
+                         'tests.settings.inheritance')
         self.assertEqual(importer.name, 'Inheritance')
diff --git a/configurations/tests/test_values.py b/tests/test_values.py
similarity index 100%
rename from configurations/tests/test_values.py
rename to tests/test_values.py
diff --git a/configurations/tests/urls.py b/tests/urls.py
similarity index 100%
rename from configurations/tests/urls.py
rename to tests/urls.py