diff --git a/tests/__init__.py b/heatclient/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to heatclient/tests/__init__.py
diff --git a/tests/fakes.py b/heatclient/tests/fakes.py
similarity index 100%
rename from tests/fakes.py
rename to heatclient/tests/fakes.py
diff --git a/tests/test_common_http.py b/heatclient/tests/test_common_http.py
similarity index 100%
rename from tests/test_common_http.py
rename to heatclient/tests/test_common_http.py
diff --git a/tests/test_shell.py b/heatclient/tests/test_shell.py
similarity index 100%
rename from tests/test_shell.py
rename to heatclient/tests/test_shell.py
diff --git a/tests/test_utils.py b/heatclient/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to heatclient/tests/test_utils.py
diff --git a/tests/v1/__init__.py b/heatclient/tests/v1/__init__.py
similarity index 100%
rename from tests/v1/__init__.py
rename to heatclient/tests/v1/__init__.py
diff --git a/tests/var/minimal.template b/heatclient/tests/var/minimal.template
similarity index 100%
rename from tests/var/minimal.template
rename to heatclient/tests/var/minimal.template
diff --git a/setup.cfg b/setup.cfg
index 3b912ed0..50c953db 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,7 +35,6 @@ cover-html = true
 cover-erase = true
 cover-inclusive = true
 verbosity=2
-detailed-errors=1
 
 [build_sphinx]
 source-dir = doc/source