diff --git a/.zuul.yaml b/.zuul.yaml
index 689a9bb49..b00fba4d1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -142,7 +142,7 @@
     parent: legacy-dsvm-base
     run: playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
     post-run: playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/post.yaml
-    timeout: 4200
+    timeout: 10800
     required-projects:
       - openstack-infra/devstack-gate
       - openstack/aodh
@@ -150,6 +150,9 @@
       - openstack/devstack-plugin-kafka
       - openstack/oslo.messaging
       - openstack/panko
+      - openstack/telemetry-tempest-plugin
+      - openstack/heat-tempest-plugin
+      - openstack/heat
       # following are required when DEVSTACK_GATE_HEAT, which this
       # job turns on
       - openstack/dib-utils
diff --git a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
index a6c91696b..1c8f60348 100644
--- a/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
+++ b/playbooks/oslo.messaging-telemetry-dsvm-integration-kafka/run.yaml
@@ -29,49 +29,29 @@
           set -e
           set -x
           export PYTHONUNBUFFERED=true
-
           export DEVSTACK_GATE_HEAT=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
-
-          export PROJECTS="openstack/ceilometer $PROJECTS"
-          export PROJECTS="openstack/aodh $PROJECTS"
+          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
+          export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko openstack/telemetry-tempest-plugin openstack/heat openstack/heat-tempest-plugin"
           export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS"
-
-          case "$ZUUL_BRANCH" in
-              "stable/ocata")
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
-                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                  export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.1"
-                  export PROJECTS="openstack/panko $PROJECTS openstack/gnocchi"
-                  ;;
-              *)
-                export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
-                export PROJECTS="openstack/panko $PROJECTS"
-                ;;
-          esac
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/heat-tempest-plugin /opt/stack/new/telemetry-tempest-plugin'"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
-
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=5"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_STORAGE_BACKEND=file"
-
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-kafka git://git.openstack.org/openstack/devstack-plugin-kafka"
-
-          export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
-
+          export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
           function post_test_hook {
-              cd /opt/stack/new/ceilometer/ceilometer/tests/integration/hooks/
+              cd /opt/stack/new/telemetry-tempest-plugin/telemetry_tempest_plugin/integration/hooks/
               ./post_test_hook.sh
           }
           export -f post_test_hook
-
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
         executable: /bin/bash
diff --git a/setup-test-env-kafka.sh b/setup-test-env-kafka.sh
index 2db436353..8d58cdbff 100755
--- a/setup-test-env-kafka.sh
+++ b/setup-test-env-kafka.sh
@@ -4,7 +4,7 @@ set -e
 . tools/functions.sh
 
 SCALA_VERSION=${SCALA_VERSION:-"2.12"}
-KAFKA_VERSION=${KAFKA_VERSION:-"1.0.0"}
+KAFKA_VERSION=${KAFKA_VERSION:-"1.1.0"}
 
 if [[ -z "$(which kafka-server-start)" ]] && [[ -z $(which kafka-server-start.sh) ]]; then
     DATADIR=$(mktemp -d /tmp/OSLOMSG-KAFKA.XXXXX)