diff --git a/.zuul.yaml b/.zuul.yaml
index 87f833859..0ddb99db8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -98,6 +98,13 @@
         NODEPOOL_PAUSE_OPENSUSE_423_DIB: false
         NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB: false
 
+- job:
+    name: nodepool-functional-py35-gentoo-src
+    parent: nodepool-functional-py35-src-base
+    vars:
+      devstack_localrc:
+        NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB: false
+
 - job:
     name: nodepool-functional-py35-ubuntu-src
     parent: nodepool-functional-py35-src-base
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 146420143..65b3ccc9b 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -213,6 +213,7 @@ EOF
     NODEPOOL_UBUNTU_XENIAL_MIN_READY=1
     NODEPOOL_OPENSUSE_423_MIN_READY=1
     NODEPOOL_OPENSUSE_TUMBLEWEED_MIN_READY=1
+    NODEPOOL_GENTOO_17_0_SYSTEMD_MIN_READY=1
 
     if $NODEPOOL_PAUSE_CENTOS_7_DIB ; then
        NODEPOOL_CENTOS_7_MIN_READY=0
@@ -238,6 +239,9 @@ EOF
     if $NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB ; then
         NODEPOOL_OPENSUSE_TUMBLEWEED_MIN_READY=0
     fi
+    if $NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB; then
+        NODEPOOL_GENTOO_17_0_SYSTEMD_MIN_READY=0
+    fi
 
     cat > /tmp/nodepool.yaml <<EOF
 # You will need to make and populate this path as necessary,
@@ -267,6 +271,8 @@ labels:
     min-ready: $NODEPOOL_OPENSUSE_423_MIN_READY
   - name: opensuse-tumbleweed
     min-ready: $NODEPOOL_OPENSUSE_TUMBLEWEED_MIN_READY
+  - name: gentoo-17-0-systemd
+    min-ready: $NODEPOOL_GENTOO_17_0_SYSTEMD_MIN_READY
 
 providers:
   - name: devstack
@@ -293,6 +299,8 @@ providers:
         config-drive: true
       - name: opensuse-tumbleweed
         config-drive: true
+      - name: gentoo-17-0-systemd
+        config-drive: true
     pools:
       - name: main
         max-servers: 5
@@ -345,6 +353,12 @@ providers:
             flavor-name: 'nodepool'
             console-log: True
             key-name: $NODEPOOL_KEY_NAME
+          - name: gentoo-17-0-systemd
+            diskimage: gentoo-17-0-systemd
+            min-ram: 512
+            flavor-name: 'nodepool'
+            console-log: True
+            key-name: $NODEPOOL_KEY_NAME
 
 diskimages:
   - name: centos-7
@@ -530,6 +544,26 @@ diskimages:
       $DIB_GLEAN_INSTALLTYPE
       $DIB_GLEAN_REPOLOCATION
       $DIB_GLEAN_REPOREF
+  - name: gentoo-17-0-systemd
+    pause: $NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB
+    rebuild-age: 86400
+    elements:
+      - gentoo
+      - vm
+      - simple-init
+      - devuser
+      - openssh-server
+      - nodepool-setup
+    env-vars:
+      TMPDIR: $NODEPOOL_DIB_BASE_PATH/tmp
+      DIB_CHECKSUM: '1'
+      DIB_IMAGE_CACHE: $NODEPOOL_DIB_BASE_PATH/cache
+      DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
+      $DIB_GET_PIP
+      $DIB_GLEAN_INSTALLTYPE
+      $DIB_GLEAN_REPOLOCATION
+      $DIB_GLEAN_REPOREF
+      GENTOO_PROFILE: 'default/linux/amd64/17.0/systemd'
 EOF
 
     sudo mv /tmp/nodepool.yaml $NODEPOOL_CONFIG
diff --git a/devstack/settings b/devstack/settings
index cc6a17ddc..eb7202aa8 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -14,6 +14,7 @@ NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-true}
 NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-true}
 NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-true}
 NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB=${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB:-true}
+NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB=${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB:-true}
 
 SHADE_REPO_URL=${SHADE_REPO_URL:-https://git.openstack.org/openstack-infra/shade}
 SHADE_REPO_REF=${SHADE_REPO_REF:-master}
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index e90249ebe..ade8485a1 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -23,6 +23,7 @@ NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=${NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB:-True}
 NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=${NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB:-True}
 NODEPOOL_PAUSE_OPENSUSE_423_DIB=${NODEPOOL_PAUSE_OPENSUSE_423_DIB:-True}
 NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB=${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB:-True}
+NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB=${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB:-True}
 
 function sshintonode {
     name=$1
@@ -124,6 +125,14 @@ if [ ${NODEPOOL_PAUSE_OPENSUSE_TUMBLEWEED_DIB,,} = 'false' ]; then
     # check ssh for root user
     sshintonode opensuse-tumbleweed
 fi
+if [ ${NODEPOOL_PAUSE_GENTOO_17_0_SYSTEMD_DIB,,} = 'false' ]; then
+    # check that image built
+    waitforimage gentoo-17-0-systemd
+    # check image was bootable
+    waitfornode gentoo-17-0-systemd
+    # check ssh for root user
+    sshintonode gentoo-17-0-systemd
+fi
 
 set -o errexit
 # Show the built nodes