diff --git a/kingbird_tempest_tests/README.rst b/tempest/README.rst
similarity index 92%
rename from kingbird_tempest_tests/README.rst
rename to tempest/README.rst
index 51c1f7f..49f09ca 100644
--- a/kingbird_tempest_tests/README.rst
+++ b/tempest/README.rst
@@ -41,8 +41,8 @@ III) Add kingbird_group and KingbirdGroup to list of opts(_opts)
 
 4. Copy tempest testcases for Kingbird::
 
-    $ cp -r kingbird_tempest_tests/tests/api/kingbird <tempest root directory>/tempest/api/
-    $ cp kingbird_tempest_tests/tests/common/kingbird.py <tempest root directory>/tempest/common/
+    $ cp -r tempest/tests/api/kingbird <tempest root directory>/tempest/api/
+    $ cp tempest/tests/common/kingbird.py <tempest root directory>/tempest/common/
 
 5. Set kingbird = True under [service_available] section in tempest.conf::
 
diff --git a/kingbird_tempest_tests/__init__.py b/tempest/__init__.py
similarity index 100%
rename from kingbird_tempest_tests/__init__.py
rename to tempest/__init__.py
diff --git a/kingbird_tempest_tests/plugin.py b/tempest/plugin.py
similarity index 95%
rename from kingbird_tempest_tests/plugin.py
rename to tempest/plugin.py
index 0f81207..ce9974b 100644
--- a/kingbird_tempest_tests/plugin.py
+++ b/tempest/plugin.py
@@ -23,7 +23,7 @@ class KingbirdTempestPlugin(plugins.TempestPlugin):
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
             os.path.abspath(__file__)))[0]
-        test_dir = "kingbird_tempest_tests/tests/"
+        test_dir = "tempest/tests/"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path
 
diff --git a/kingbird_tempest_tests/tests/api/kingbird/__init__.py b/tempest/tests/api/kingbird/__init__.py
similarity index 100%
rename from kingbird_tempest_tests/tests/api/kingbird/__init__.py
rename to tempest/tests/api/kingbird/__init__.py
diff --git a/kingbird_tempest_tests/tests/api/kingbird/base.py b/tempest/tests/api/kingbird/base.py
similarity index 100%
rename from kingbird_tempest_tests/tests/api/kingbird/base.py
rename to tempest/tests/api/kingbird/base.py
diff --git a/kingbird_tempest_tests/tests/api/kingbird/test_kingbird_api.py b/tempest/tests/api/kingbird/test_kingbird_api.py
similarity index 100%
rename from kingbird_tempest_tests/tests/api/kingbird/test_kingbird_api.py
rename to tempest/tests/api/kingbird/test_kingbird_api.py
diff --git a/kingbird_tempest_tests/tests/common/kingbird.py b/tempest/tests/common/kingbird.py
similarity index 100%
rename from kingbird_tempest_tests/tests/common/kingbird.py
rename to tempest/tests/common/kingbird.py