diff --git a/playbooks/osh-infra-airship-divingbell-check.yaml b/playbooks/osh-infra-airship-divingbell-check.yaml
new file mode 100644
index 000000000..ddffbc45f
--- /dev/null
+++ b/playbooks/osh-infra-airship-divingbell-check.yaml
@@ -0,0 +1,24 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# 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.
+
+- hosts: primary
+  tasks:
+    - name: clone and run divingbell override test
+      shell: |
+        git clone https://github.com/openstack/airship-divingbell
+        cd airship-divingbell
+        mkdir build
+        ln -s ../openstack-helm-infra build/openstack-helm-infra
+        ./tools/gate/scripts/010-build-charts.sh
+        sudo SKIP_BASE_TESTS=true ./tools/gate/scripts/020-test-divingbell.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d37b768c4..a91dae0e6 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -235,3 +235,11 @@
         - ./tools/deployment/elastic-beats/090-elastic-packetbeat.sh
         - ./tools/deployment/elastic-beats/100-elastic-apm-server.sh
         - ./tools/deployment/elastic-beats/110-kibana.sh
+
+- job:
+    name: openstack-helm-infra-airship-divingbell
+    parent: openstack-helm-infra
+    nodeset: openstack-helm-single-node
+    run: playbooks/osh-infra-airship-divingbell-check.yaml
+    required-projects:
+      - openstack/airship-divingbell
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1e5ff7739..1277fa8bf 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -28,6 +28,10 @@
             voting: false
         - openstack-helm-infra-openstack-support
         - openstack-helm-infra-kubernetes-keystone-auth
+        # some testing performed here to check for any break of host/label
+        # override functionality
+        - openstack-helm-infra-airship-divingbell:
+            voting: false
     gate:
       jobs:
         - openstack-helm-lint