diff --git a/elk_metrics_6x/tests/functional.yml b/elk_metrics_6x/tests/functional.yml
index 8c80c100..6cf8dd2a 100644
--- a/elk_metrics_6x/tests/functional.yml
+++ b/elk_metrics_6x/tests/functional.yml
@@ -28,8 +28,7 @@
     ANSIBLE_LOG_PATH: "/tmp/elk-metrics-6x-logs/ansible-elk-test.log"
 
   vars:
-    # inventory_file: "inventory/test-{{ (ansible_service_mgr == 'systemd') | ternary('container', 'metal') }}-inventory.yml"
-    inventory_file: "inventory/test-metal-inventory.yml"
+    inventory_file: "inventory/test-{{ (contianer_inventory | bool) | ternary('container', 'metal') }}-inventory.yml"
 
   pre_tasks:
     - name: Create swap file
diff --git a/elk_metrics_6x/tests/run-setup.yml b/elk_metrics_6x/tests/run-setup.yml
index 60cd8406..7fadd520 100644
--- a/elk_metrics_6x/tests/run-setup.yml
+++ b/elk_metrics_6x/tests/run-setup.yml
@@ -42,6 +42,10 @@
       when:
         - osa_test_repo is not defined
 
+    - name: Set inventory for test
+      set_fact:
+        contianer_inventory: "{{ test_clustered_elk | default(false) | bool }}"
+
   post_tasks:
     - name: Ensure the log directory exists
       file:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 7f07b614..f548474a 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -23,6 +23,7 @@
       - ^elk_metrics_6x/.*
     vars:
       osa_test_repo: "openstack/openstack-ansible-ops"
+      test_clustered_elk: false
 
 # - job:
 #     name: "openstack-ansible-ops:elk_metrics_6x-centos-7"
@@ -46,4 +47,21 @@
     name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic"
     parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
     nodeset: ubuntu-bionic
+    voting: true
+
+- job:
+    name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial-clustered"
+    parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
     voting: false
+    vars:
+      osa_test_repo: "openstack/openstack-ansible-ops"
+      test_clustered_elk: true
+
+- job:
+    name: "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic-clustered"
+    parent: "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
+    nodeset: ubuntu-bionic
+    voting: false
+    vars:
+      osa_test_repo: "openstack/openstack-ansible-ops"
+      test_clustered_elk: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 37533c5e..0b816d0f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -20,6 +20,8 @@
         - "openstack-ansible-ops:elk_metrics_6x-ubuntu-trusty"
         - "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"
         - "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic"
+        - "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial-clustered"
+        - "openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic-clustered"
     gate:
       jobs:
         - "openstack-ansible-ops:elk_metrics_6x-ubuntu-xenial"