diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 2da021d305..fe9b948fd4 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -199,8 +199,8 @@
             ./tools/deployment/common/run-helm-tests.sh glance;
             ./tools/deployment/common/run-helm-tests.sh keystone;
         - ./tools/deployment/developer/common/170-setup-gateway.sh
-        - ./tools/deployment/developer/common/900-use-it.sh
-        - ./tools/deployment/common/force-cronjob-run.sh
+        - - ./tools/deployment/developer/common/900-use-it.sh
+          - ./tools/deployment/common/force-cronjob-run.sh
 
 - job:
     name: openstack-helm-compute-kit-pike-ubuntu_xenial
@@ -312,28 +312,34 @@
         container_distro_name: ubuntu
         container_distro_version: bionic
         feature_gates: tls
+      run_helm_tests: "no"
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/scripts/tls/cert-manager.sh
+        - - ./tools/deployment/common/setup-client.sh
+          - ./tools/scripts/tls/cert-manager.sh
         - ./tools/deployment/component/ceph/ceph.sh
         - ./tools/deployment/component/ceph/ceph-ns-activate.sh
         - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
+        - - ./tools/deployment/component/common/mariadb.sh
+          - ./tools/deployment/component/common/memcached.sh
+          - ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/cinder/cinder.sh
-        - ./tools/deployment/component/heat/heat.sh
-        - ./tools/deployment/component/glance/glance.sh
-        - ./tools/deployment/component/compute-kit/openvswitch.sh
+        - - ./tools/deployment/component/cinder/cinder.sh
+          - ./tools/deployment/component/heat/heat.sh
+          - ./tools/deployment/component/glance/glance.sh
+          - ./tools/deployment/component/compute-kit/openvswitch.sh
         - ./tools/deployment/component/compute-kit/libvirt.sh
         - ./tools/deployment/component/compute-kit/compute-kit.sh
+        - - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron
+          - ./tools/deployment/common/run-helm-tests.sh nova;
+            ./tools/deployment/common/run-helm-tests.sh glance;
+            ./tools/deployment/common/run-helm-tests.sh keystone;
+            ./tools/deployment/common/run-helm-tests.sh cinder;
         - ./tools/deployment/developer/common/170-setup-gateway.sh
-        - ./tools/deployment/developer/common/900-use-it.sh
-        - ./tools/deployment/common/force-cronjob-run.sh
+        - - ./tools/deployment/developer/common/900-use-it.sh
+          - ./tools/deployment/common/force-cronjob-run.sh
 
 - job:
     name: openstack-helm-apparmor