diff --git a/tests/__init__.py b/oslotest/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to oslotest/tests/__init__.py
diff --git a/tests/unit/__init__.py b/oslotest/tests/unit/__init__.py
similarity index 100%
rename from tests/unit/__init__.py
rename to oslotest/tests/unit/__init__.py
diff --git a/tests/unit/test_base.py b/oslotest/tests/unit/test_base.py
similarity index 100%
rename from tests/unit/test_base.py
rename to oslotest/tests/unit/test_base.py
diff --git a/tests/unit/test_createfile.py b/oslotest/tests/unit/test_createfile.py
similarity index 100%
rename from tests/unit/test_createfile.py
rename to oslotest/tests/unit/test_createfile.py
diff --git a/tests/unit/test_log.py b/oslotest/tests/unit/test_log.py
similarity index 100%
rename from tests/unit/test_log.py
rename to oslotest/tests/unit/test_log.py
diff --git a/tests/unit/test_mockpatch.py b/oslotest/tests/unit/test_mockpatch.py
similarity index 100%
rename from tests/unit/test_mockpatch.py
rename to oslotest/tests/unit/test_mockpatch.py
diff --git a/tests/unit/test_moxstubout.py b/oslotest/tests/unit/test_moxstubout.py
similarity index 100%
rename from tests/unit/test_moxstubout.py
rename to oslotest/tests/unit/test_moxstubout.py
diff --git a/tests/unit/test_output.py b/oslotest/tests/unit/test_output.py
similarity index 100%
rename from tests/unit/test_output.py
rename to oslotest/tests/unit/test_output.py
diff --git a/tests/unit/test_timeout.py b/oslotest/tests/unit/test_timeout.py
similarity index 100%
rename from tests/unit/test_timeout.py
rename to oslotest/tests/unit/test_timeout.py