diff --git a/.zuul.yaml b/.zuul.yaml
index 138121bac..a5be8a38a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,10 +21,12 @@
         - watcher-tempest-host_maintenance
         - watcher-tempest-storage_balance
         - watcher-tls-test
+        - watcher-tempest-functional-ipv6-only
     gate:
       queue: watcher
       jobs:
         - watcher-tempest-functional
+        - watcher-tempest-functional-ipv6-only
 
 - job:
     name: watcher-tempest-dummy_optim
@@ -160,7 +162,7 @@
     name: watcher-tempest-functional
     parent: devstack-tempest
     timeout: 7200
-    required-projects:
+    required-projects: &base_required_projects
       - openstack/ceilometer
       - openstack/devstack-gate
       - openstack/python-openstackclient
@@ -168,7 +170,7 @@
       - openstack/watcher
       - openstack/watcher-tempest-plugin
       - openstack/tempest
-    vars:
+    vars: &base_vars
       devstack_plugins:
         watcher: https://opendev.org/openstack/watcher
       devstack_services:
@@ -191,6 +193,14 @@
       zuul_copy_output:
         /etc/hosts: logs
 
+- job:
+    name: watcher-tempest-functional-ipv6-only
+    parent: devstack-tempest-ipv6
+    description: |
+      Watcher devstack tempest tests job for IPv6-only deployment
+    required-projects: *base_required_projects
+    vars: *base_vars
+
 - job:
     name: watcher-grenade
     parent: legacy-dsvm-base
diff --git a/devstack/lib/watcher b/devstack/lib/watcher
index aefb1572c..53f915500 100644
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -193,15 +193,15 @@ function create_watcher_conf {
     iniset_rpc_backend watcher $WATCHER_CONF
 
     iniset $WATCHER_CONF database connection $(database_connection_url watcher)
-    iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
+    iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
 
     if is_service_enabled tls-proxy; then
-        iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
+        iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
         iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT"
         # iniset $WATCHER_CONF api enable_ssl_api "True"
     else
         if [[ "$WATCHER_USE_WSGI_MODE" == "mod_wsgi" ]]; then
-            iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
+            iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
             iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
         fi
     fi