diff --git a/.testr.conf b/.testr.conf
index b72b987e..4da4d7db 100755
--- a/.testr.conf
+++ b/.testr.conf
@@ -2,6 +2,6 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover saharaclient $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/saharaclient/tests/nova/__init__.py b/saharaclient/tests/integration/__init__.py
similarity index 100%
rename from saharaclient/tests/nova/__init__.py
rename to saharaclient/tests/integration/__init__.py
diff --git a/saharaclient/tests/integration/configs/__init__.py b/saharaclient/tests/integration/configs/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/saharaclient/tests/integration/tests/__init__.py b/saharaclient/tests/integration/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/saharaclient/tests/unit/__init__.py b/saharaclient/tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/saharaclient/tests/unit/nova/__init__.py b/saharaclient/tests/unit/nova/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/saharaclient/tests/nova/test_shell.py b/saharaclient/tests/unit/nova/test_shell.py
similarity index 99%
rename from saharaclient/tests/nova/test_shell.py
rename to saharaclient/tests/unit/nova/test_shell.py
index 9e0d8219..8ba3a659 100644
--- a/saharaclient/tests/nova/test_shell.py
+++ b/saharaclient/tests/unit/nova/test_shell.py
@@ -25,7 +25,7 @@ from testtools import matchers
 import saharaclient.api.client
 from saharaclient.openstack.common.apiclient import exceptions
 import saharaclient.shell
-from saharaclient.tests.nova import utils
+from saharaclient.tests.unit.nova import utils
 
 FAKE_ENV = {'OS_USERNAME': 'username',
             'OS_PASSWORD': 'password',
diff --git a/saharaclient/tests/nova/utils.py b/saharaclient/tests/unit/nova/utils.py
similarity index 100%
rename from saharaclient/tests/nova/utils.py
rename to saharaclient/tests/unit/nova/utils.py
diff --git a/saharaclient/tests/test_resource.py b/saharaclient/tests/unit/test_resource.py
similarity index 100%
rename from saharaclient/tests/test_resource.py
rename to saharaclient/tests/unit/test_resource.py
diff --git a/tox.ini b/tox.ini
index 2c30e3a2..aae3630c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,11 +9,18 @@ install_command = pip install -U {opts} {packages}
 sitepackages = True
 setenv =
     VIRTUAL_ENV={envdir}
+    DISCOVER_DIRECTORY=saharaclient/tests/unit
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = python setup.py test --slowest --testr-args="{posargs}"
 
+[testenv:integration]
+setenv =
+    VIRTUAL_ENV={envdir}
+    DISCOVER_DIRECTORY=saharaclient/tests/integration/
+    commands = python setup.py test --slowest --testr-args="{posargs}"
+
 [testenv:cover]
 commands = python setup.py test --coverage --testr-args='{posargs}'