diff --git a/.zuul.yaml b/.zuul.yaml
index 88e59ca..f4f7774 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -22,6 +22,7 @@
       - openstack/dib-utils
       - openstack/diskimage-builder
       - openstack/tempest
+      - gnocchixyz/gnocchi
     vars:
       configure_swap_size: 8192
       devstack_plugins:
@@ -37,6 +38,12 @@
         CEILOMETER_BACKEND: "gnocchi"
         CEILOMETER_PIPELINE_INTERVAL: 15
         USE_PYTHON3: False
+        CEILOMETER_ALARM_THRESHOLD: 6000000000
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            telemetry:
+              disable_ssl_certificate_validation: True
       tempest_test_regex: telemetry_tempest_plugin
       tox_envlist: all
     branches:
@@ -70,6 +77,7 @@
       - openstack/dib-utils
       - openstack/diskimage-builder
       - openstack/tempest
+      - gnocchixyz/gnocchi
     vars: &base_vars
       configure_swap_size: 8192
       devstack_plugins:
@@ -85,6 +93,12 @@
         GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
         CEILOMETER_BACKEND: "gnocchi"
         CEILOMETER_PIPELINE_INTERVAL: 15
+        CEILOMETER_ALARM_THRESHOLD: 6000000000
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            telemetry:
+              disable_ssl_certificate_validation: True
       tempest_test_regex: telemetry_tempest_plugin
       tox_envlist: all
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index fe1b603..f696c7b 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,8 +37,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'openstack'
-copyright = u'2017, OpenStack Developers'
+project = 'openstack'
+copyright = '2017, OpenStack Developers'
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/openstack'
@@ -73,8 +73,8 @@
 latex_documents = [
     ('index',
      '%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Developers', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Developers', 'manual'),
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 83b2967..518638f 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -52,8 +52,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'telemetry_tempest_plugin Release Notes'
-copyright = u'2017, OpenStack Developers'
+project = 'telemetry_tempest_plugin Release Notes'
+copyright = '2017, OpenStack Developers'
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/telemetry-tempest-plugin'
@@ -208,8 +208,8 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'telemetry_tempest_pluginReleaseNotes.tex',
-     u'telemetry_tempest_plugin  Release Notes Documentation',
-     u'OpenStack Foundation', 'manual'),
+     'telemetry_tempest_plugin  Release Notes Documentation',
+     'OpenStack Foundation', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -239,8 +239,8 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'telemetry_tempest_pluginrereleasenotes',
-     u'telemetry_tempest_plugin  Release Notes Documentation',
-     [u'OpenStack Foundation'], 1)
+     'telemetry_tempest_plugin  Release Notes Documentation',
+     ['OpenStack Foundation'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -254,8 +254,8 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'telemetry_tempest_plugin ReleaseNotes',
-     u'telemetry_tempest_plugin Release Notes Documentation',
-     u'OpenStack Foundation', 'telemetry_tempest_pluginReleaseNotes',
+     'telemetry_tempest_plugin Release Notes Documentation',
+     'OpenStack Foundation', 'telemetry_tempest_pluginReleaseNotes',
      'One line description of project.',
      'Miscellaneous'),
 ]
diff --git a/telemetry_tempest_plugin/aodh/api/base.py b/telemetry_tempest_plugin/aodh/api/base.py
index 29b1d61..816f204 100644
--- a/telemetry_tempest_plugin/aodh/api/base.py
+++ b/telemetry_tempest_plugin/aodh/api/base.py
@@ -29,7 +29,7 @@
     @classmethod
     def skip_checks(cls):
         super(BaseAlarmingTest, cls).skip_checks()
-        if not CONF.service_available.aodh_plugin:
+        if not CONF.service_available.aodh:
             raise cls.skipException("Aodh support is required")
 
     @classmethod