diff --git a/Makefile b/Makefile
index acc7d5e..2e2b2db 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,12 @@ PYTHON := /usr/bin/env python
 
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks
-	@flake8 --exclude hooks/charmhelpers tests
+	@flake8 --exclude hooks/charmhelpers unit_tests
 	@charm proof
 
 test:
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  tests
+	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
 
 sync:
 	@charm-helper-sync -c charm-helpers-sync.yaml
diff --git a/tests/__init__.py b/unit_tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to unit_tests/__init__.py
diff --git a/tests/test_nova_compute_contexts.py b/unit_tests/test_nova_compute_contexts.py
similarity index 99%
rename from tests/test_nova_compute_contexts.py
rename to unit_tests/test_nova_compute_contexts.py
index 6a516ec..ec11003 100644
--- a/tests/test_nova_compute_contexts.py
+++ b/unit_tests/test_nova_compute_contexts.py
@@ -1,6 +1,6 @@
 from mock import MagicMock
 from copy import deepcopy
-from tests.test_utils import CharmTestCase
+from unit_tests.test_utils import CharmTestCase
 
 import hooks.nova_compute_context as context
 
diff --git a/tests/test_nova_compute_relations.py b/unit_tests/test_nova_compute_relations.py
similarity index 99%
rename from tests/test_nova_compute_relations.py
rename to unit_tests/test_nova_compute_relations.py
index b7b325c..eda966f 100644
--- a/tests/test_nova_compute_relations.py
+++ b/unit_tests/test_nova_compute_relations.py
@@ -1,6 +1,6 @@
 from mock import call, patch, MagicMock
 
-from tests.test_utils import CharmTestCase
+from unit_tests.test_utils import CharmTestCase
 
 import hooks.nova_compute_utils as utils
 
diff --git a/tests/test_nova_compute_utils.py b/unit_tests/test_nova_compute_utils.py
similarity index 99%
rename from tests/test_nova_compute_utils.py
rename to unit_tests/test_nova_compute_utils.py
index c2bfbab..ac79ba0 100644
--- a/tests/test_nova_compute_utils.py
+++ b/unit_tests/test_nova_compute_utils.py
@@ -1,6 +1,6 @@
 from mock import patch, MagicMock, call
 
-from tests.test_utils import CharmTestCase, patch_open
+from unit_tests.test_utils import CharmTestCase, patch_open
 
 
 import hooks.nova_compute_utils as utils
diff --git a/tests/test_utils.py b/unit_tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to unit_tests/test_utils.py