diff --git a/mistral_tempest_tests/__init__.py b/mistral_tempest_tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/mistral_tempest_tests/plugin.py b/mistral_tempest_tests/plugin.py
new file mode 100644
index 000000000..ff7f0a6ad
--- /dev/null
+++ b/mistral_tempest_tests/plugin.py
@@ -0,0 +1,34 @@
+# Copyright 2015
+# 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.test_discover import plugins
+
+
+class MistralTempestPlugin(plugins.TempestPlugin):
+    def load_tests(self):
+        base_path = os.path.split(os.path.dirname(
+            os.path.abspath(__file__)))[0]
+        test_dir = "mistral_tempest_tests/tests/"
+        full_test_dir = os.path.join(base_path, test_dir)
+        return full_test_dir, base_path
+
+    def register_opts(self, conf):
+        pass
+
+    def get_opt_lists(self):
+        pass
diff --git a/mistral_tempest_tests/services/__init__.py b/mistral_tempest_tests/services/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/mistral_tempest_tests/tests/__init__.py b/mistral_tempest_tests/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/mistral_tempest_tests/tests/api/__init__.py b/mistral_tempest_tests/tests/api/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/mistral_tempest_tests/tests/scenario/__init__.py b/mistral_tempest_tests/tests/scenario/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/setup.cfg b/setup.cfg
index ffb1a18a5..33cd811e8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,6 +37,9 @@ console_scripts =
 oslo.config.opts =
     mistral.config = mistral.config:list_opts
 
+tempest.test_plugins =
+    mistral_test = mistral_tempest_tests.plugin:MistralTempestPlugin
+
 mistral.actions =
     std.async_noop = mistral.actions.std_actions:AsyncNoOpAction
     std.noop = mistral.actions.std_actions:NoOpAction