diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 498b4dba8e..fc931ef435 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -857,6 +857,7 @@ jobs:
           - ^.*\.rst$
           - ^doc/.*$
           - ^releasenotes/.*$
+  # Skip non-doc jobs for doc-only neutron-lib changes.
   - name: ^.*neutron-lib-python(27|34)(-constraints)?$
     skip-if:
       - project: ^openstack/neutron-lib$
@@ -864,6 +865,15 @@ jobs:
           - ^.*\.rst$
           - ^doc/.*$
           - ^releasenotes/.*$
+  # Skip non-doc jobs for doc-only neutron-vpnaas changes. The dsvm
+  # tests area already skipped by another check.
+  - name: ^.*neutron-vpnaas-python(27|34)(-constraints)?$
+    skip-if:
+      - project: ^openstack/neutron-vpnaas$
+        all-files-match-any:
+          - ^.*\.rst$
+          - ^doc/.*$
+          - ^releasenotes/.*$
   # Skip all except release notes and pep8 jobs for heat
   - name: ^.*heat-(docs|dsvm-functional-(orig|convg)|python(27|34)).*$
     skip-if: