diff --git a/.zuul.yaml b/.zuul.yaml
index fbfcad6..7839417 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -745,6 +745,30 @@
         networking-bgpvpn: https://git.openstack.org/openstack/networking-bgpvpn
         networking-bagpipe: https://git.openstack.org/openstack/networking-bagpipe
 
+- job:
+    name: neutron-tempest-plugin-fwaas
+    parent: neutron-tempest-plugin
+    timeout: 10800
+    required-projects:
+      - openstack/devstack-gate
+      - openstack/neutron-fwaas
+      - openstack/neutron
+      - openstack/neutron-tempest-plugin
+      - openstack/tempest
+    vars:
+      tempest_test_regex: ^neutron_tempest_plugin\.fwaas
+      tox_envlist: all-plugin
+      devstack_plugins:
+        neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
+        neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
+      network_api_extensions_common: *api_extensions_master
+      network_api_extensions_fwaas:
+        - fwaas_v2
+      devstack_localrc:
+        NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_fwaas) | join(',') }}"
+    files:
+      - ^neutron_tempest_plugin/fwaas/.*$
+
 - project-template:
     name: neutron-tempest-plugin-jobs
     check:
@@ -808,6 +832,8 @@
       jobs:
         - neutron-tempest-plugin-sfc
         - neutron-tempest-plugin-bgpvpn-bagpipe
+        - neutron-tempest-plugin-fwaas
     gate:
       jobs:
         - neutron-tempest-plugin-bgpvpn-bagpipe
+        - neutron-tempest-plugin-fwaas