diff --git a/keystone_tempest_plugin/README.rst b/keystone_tempest_plugin/README.rst
new file mode 100644
index 0000000..c880e28
--- /dev/null
+++ b/keystone_tempest_plugin/README.rst
@@ -0,0 +1,6 @@
+==========================
+Tempest tests for keystone
+==========================
+
+This directory contains Tempest tests to cover the keystone project.
+
diff --git a/keystone_tempest_plugin/__init__.py b/keystone_tempest_plugin/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/keystone_tempest_plugin/__init__.py
diff --git a/keystone_tempest_plugin/config.py b/keystone_tempest_plugin/config.py
new file mode 100644
index 0000000..aaebcfb
--- /dev/null
+++ b/keystone_tempest_plugin/config.py
@@ -0,0 +1,28 @@
+# Copyright 2016 Red Hat, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+from oslo_config import cfg
+
+
+identity_group = cfg.OptGroup(name='identity',
+                              title="Keystone Configuration Options")
+
+IdentityGroup = []
+
+identity_feature_group = cfg.OptGroup(name='identity-feature-enabled',
+                                      title='Enabled Identity Features')
+
+IdentityFeatureGroup = []
diff --git a/keystone_tempest_plugin/plugin.py b/keystone_tempest_plugin/plugin.py
new file mode 100644
index 0000000..9fe67e8
--- /dev/null
+++ b/keystone_tempest_plugin/plugin.py
@@ -0,0 +1,39 @@
+# Copyright 2016 Red Hat, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+import os
+
+from tempest import config
+from tempest.test_discover import plugins
+
+from keystone_tempest_plugin import config as project_config
+
+
+class KeystoneTempestPlugin(plugins.TempestPlugin):
+    def load_tests(self):
+        base_path = os.path.split(os.path.dirname(
+            os.path.abspath(__file__)))[0]
+        test_dir = "keystone_tempest_plugin/tests"
+        full_test_dir = os.path.join(base_path, test_dir)
+        return full_test_dir, base_path
+
+    def register_opts(self, conf):
+        config.register_opt_group(conf, project_config.identity_group,
+                                  project_config.IdentityGroup)
+
+    def get_opt_lists(self):
+        return [(project_config.identity_group.name,
+                 project_config.IdentityGroup)]
diff --git a/keystone_tempest_plugin/services/__init__.py b/keystone_tempest_plugin/services/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/keystone_tempest_plugin/services/__init__.py
diff --git a/keystone_tempest_plugin/tests/__init__.py b/keystone_tempest_plugin/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/keystone_tempest_plugin/tests/__init__.py
diff --git a/keystone_tempest_plugin/tests/api/__init__.py b/keystone_tempest_plugin/tests/api/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/keystone_tempest_plugin/tests/api/__init__.py
diff --git a/keystone_tempest_plugin/tests/scenario/__init__.py b/keystone_tempest_plugin/tests/scenario/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/keystone_tempest_plugin/tests/scenario/__init__.py