diff --git a/.zuul.yaml b/.zuul.yaml
index f765840..0711f5c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,6 +29,7 @@
         tempest: true
         tls-proxy: false
       devstack_localrc:
+        USE_PYTHON3: True
         TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"'
         GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
         CEILOMETER_BACKEND: "gnocchi"
@@ -39,7 +40,17 @@
 - job:
     name: telemetry-dsvm-integration
     parent: telemetry-tempest-base
-    branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train)).*$
+
+- job:
+    name: telemetry-dsvm-integration
+    parent: telemetry-tempest-base
+    branches:
+      - stable/stein
+      - stable/train
+    vars:
+      devstack_localrc:
+        USE_PYTHON3: False
 
 - job:
     name: telemetry-dsvm-integration
@@ -50,6 +61,7 @@
       - stable/rocky
     vars:
       devstack_localrc:
+        USE_PYTHON3: False
         GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high"
         GNOCCHI_ARCHIVE_POLICY: "high"
         CEILOMETER_ALARM_AGGREGATION_METHOD: "mean"
@@ -58,7 +70,7 @@
 - job:
     name: telemetry-dsvm-integration-ipv6-only
     parent: devstack-tempest-ipv6
-    branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
     description: |
       Telemetry devstack tempest tests job for IPv6-only deployment
     required-projects: *base_required_projects
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 94e0794..7777a1b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,14 +1,14 @@
 If you would like to contribute to the development of OpenStack, you must
 follow the steps in this page:
 
-   http://docs.openstack.org/infra/manual/developers.html
+   https://docs.openstack.org/infra/manual/developers.html
 
 If you already have a good understanding of how the system works and your
 OpenStack accounts are set up, you can skip to the development workflow
 section of this documentation to learn how changes to OpenStack should be
 submitted for review via the Gerrit tool:
 
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
diff --git a/setup.cfg b/setup.cfg
index 48b502f..f69060c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@
     README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page = https://www.openstack.org/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
diff --git a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml
index 9349295..1c55f0b 100644
--- a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml
+++ b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml
@@ -20,7 +20,8 @@
     - name: SETUP. create archive policy gabbiliveceph
       desc: create archve policy 'gabbiliveceph' for tests
       POST: $ENVIRON['GNOCCHI_SERVICE_URL']/v1/archive_policy
-      status: 201
+      # 409 when policy with such name already exists
+      status: 201 || 409
       request_headers:
           content-type: application/json
       data:
@@ -37,8 +38,13 @@
               - mean
               - min
               - max
+
+    - name: check properties of created or existing archive policy
+      GET: $ENVIRON['GNOCCHI_SERVICE_URL']/v1/archive_policy/gabbiliveceph
+      status: 200
+      request_headers:
+          content-type: application/json
       response_json_paths:
-          $.name: gabbiliveceph
           $.back_window: 0
           $.aggregation_methods.`len`: 3
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 9af8c9c..b2555d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,8 @@
 
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 
-sphinx>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
 openstackdocstheme>=1.11.0  # Apache-2.0
 # releasenotes
 reno>=1.8.0 # Apache-2.0