diff --git a/ceilometer/tests/tempest/plugin.py b/ceilometer/tests/tempest/plugin.py
new file mode 100644
index 0000000000..c3a446c2e4
--- /dev/null
+++ b/ceilometer/tests/tempest/plugin.py
@@ -0,0 +1,42 @@
+#
+# Copyright 2015 NEC Corporation.
+#
+# 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 ceilometer.tests.tempest import config as tempest_config
+from tempest import config
+from tempest.test_discover import plugins
+
+
+class CeilometerTempestPlugin(plugins.TempestPlugin):
+
+    def load_tests(self):
+        base_path = os.path.split(os.path.dirname(
+            os.path.abspath(__file__)))[0]
+        test_dir = "ceilometer/tests/tempest"
+        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,
+                                  tempest_config.service_available_group,
+                                  tempest_config.ServiceAvailableGroup)
+        config.register_opt_group(conf,
+                                  tempest_config.telemetry_group,
+                                  tempest_config.TelemetryGroup)
+
+    def get_opt_lists(self):
+        return [(tempest_config.telemetry_group.name,
+                 tempest_config.TelemetryGroup)]
diff --git a/setup.cfg b/setup.cfg
index 81c829f69d..53f02b595f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -265,6 +265,9 @@ oslo.config.opts =
 keystoneauth1.plugin =
     password-ceilometer-legacy = ceilometer.keystone_client:LegacyCeilometerKeystoneLoader
 
+tempest.test_plugins =
+    ceilometer_tests = ceilometer.tests.tempest.plugin:CeilometerTempestPlugin
+
 [build_sphinx]
 all_files = 1
 build-dir = doc/build