diff --git a/muranodashboard/tests/__init__.py b/muranodashboard/test/__init__.py
similarity index 100%
rename from muranodashboard/tests/__init__.py
rename to muranodashboard/test/__init__.py
diff --git a/muranodashboard/tests/settings.py b/muranodashboard/test/settings.py
similarity index 100%
rename from muranodashboard/tests/settings.py
rename to muranodashboard/test/settings.py
diff --git a/muranodashboard/tests/test_fields.py b/muranodashboard/test/test_fields.py
similarity index 100%
rename from muranodashboard/tests/test_fields.py
rename to muranodashboard/test/test_fields.py
diff --git a/muranodashboard/tests/test_utils.py b/muranodashboard/test/test_utils.py
similarity index 100%
rename from muranodashboard/tests/test_utils.py
rename to muranodashboard/test/test_utils.py
diff --git a/tox.ini b/tox.ini
index 2f113e576..3fe550db0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        http://tarballs.openstack.org/horizon/horizon-stable-havana.tar.gz
 
-commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings
+commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.test.settings
 
 [testenv:pep8]
 deps = pep8==1.3.3