diff --git a/.testr.conf b/.testr.conf
index 081907d..ef5d319 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests/units/ $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/functional_tests/__init__.py b/tests/functional/__init__.py
similarity index 100%
rename from functional_tests/__init__.py
rename to tests/functional/__init__.py
diff --git a/functional_tests/test_middleware_lm.py b/tests/functional/test_middleware_lm.py
similarity index 100%
rename from functional_tests/test_middleware_lm.py
rename to tests/functional/test_middleware_lm.py
diff --git a/tests/__init__.py b/tests/units/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to tests/units/__init__.py
diff --git a/tests/base.py b/tests/units/base.py
similarity index 100%
rename from tests/base.py
rename to tests/units/base.py
diff --git a/tests/fakes.py b/tests/units/fakes.py
similarity index 100%
rename from tests/fakes.py
rename to tests/units/fakes.py
diff --git a/tests/test_accounts.py b/tests/units/test_accounts.py
similarity index 100%
rename from tests/test_accounts.py
rename to tests/units/test_accounts.py
diff --git a/tests/test_containers.py b/tests/units/test_containers.py
similarity index 100%
rename from tests/test_containers.py
rename to tests/units/test_containers.py
diff --git a/tests/test_filler.py b/tests/units/test_filler.py
similarity index 100%
rename from tests/test_filler.py
rename to tests/units/test_filler.py
diff --git a/tests/test_middleware_lm.py b/tests/units/test_middleware_lm.py
similarity index 100%
rename from tests/test_middleware_lm.py
rename to tests/units/test_middleware_lm.py
diff --git a/tests/test_objects.py b/tests/units/test_objects.py
similarity index 100%
rename from tests/test_objects.py
rename to tests/units/test_objects.py
diff --git a/tests/test_utils.py b/tests/units/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to tests/units/test_utils.py
diff --git a/tools/pip-requires b/tools/pip-requires
index 166bc48..33628ff 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -6,3 +6,4 @@ python-dateutil
 netifaces
 python-keystoneclient
 eventlet
+pastedeploy>=1.3.3