diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index 560f5ed30..f80e894ec 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -32,6 +32,7 @@ PLATFORMS = [
     'centos-7',
     'debian-stretch',
     'fedora-29',
+    'gentoo-17-0-systemd',
     'opensuse-15',
     'opensuse-tumbleweed',
     'ubuntu-bionic',
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index 5f12cd2c9..3ae7fe07a 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -57,6 +57,16 @@
         - name: fedora-29
           label: fedora-29
 
+- job:
+    name: zuul-jobs-test-base-roles-gentoo-17-0-systemd
+    description: Tests roles in the 'base' job on gentoo-17-0-systemd
+    parent: zuul-jobs-test-base-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: gentoo-17-0-systemd
+          label: gentoo-17-0-systemd
+
 - job:
     name: zuul-jobs-test-base-roles-opensuse-15
     description: Tests roles in the 'base' job on opensuse-15
@@ -120,9 +130,9 @@
     files:
       - ^roles/multi-node-bridge/.*
       - ^roles/multi-node-firewall/.*
-      - ^roles/persistent-firewall/.*
       - ^roles/multi-node-hosts-file/.*
       - ^roles/multi-node-known-hosts/.*
+      - ^roles/persistent-firewall/.*
       - ^test-playbooks/multinode/.*
 
 - job:
@@ -182,6 +192,25 @@
           nodes:
             - secondary
 
+- job:
+    name: zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
+    description: Tests multinode setup roles on gentoo-17-0-systemd
+    parent: zuul-jobs-test-multinode-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: primary
+          label: gentoo-17-0-systemd
+        - name: secondary
+          label: gentoo-17-0-systemd
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
 - job:
     name: zuul-jobs-test-multinode-roles-opensuse-15
     description: Tests multinode setup roles on opensuse-15
@@ -291,6 +320,7 @@
         - zuul-jobs-test-base-roles-centos-7
         - zuul-jobs-test-base-roles-debian-stretch
         - zuul-jobs-test-base-roles-fedora-29
+        - zuul-jobs-test-base-roles-gentoo-17-0-systemd
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-opensuse-tumbleweed
         - zuul-jobs-test-base-roles-ubuntu-bionic
@@ -299,6 +329,7 @@
         - zuul-jobs-test-multinode-roles-centos-7
         - zuul-jobs-test-multinode-roles-debian-stretch
         - zuul-jobs-test-multinode-roles-fedora-29
+        - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed
         - zuul-jobs-test-multinode-roles-ubuntu-bionic