diff --git a/.zuul.yaml b/.zuul.yaml
index f0bf1934bc..47ad8dd226 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -131,6 +131,14 @@
           label: ubuntu-bionic
         - name: centos7
           label: centos-7
+      groups:
+        # We test puppet installation on this group.  Note bionic not
+        # in here as we have no bionic puppeted nodes (yet?)
+        - name: puppet
+          nodes:
+            - trusty
+            - xenial
+            - centos7
     host-vars:
       trusty:
         ansible_python_interpreter: python2
diff --git a/playbooks/base.yaml b/playbooks/base.yaml
index 1719e2de53..474d2e3673 100644
--- a/playbooks/base.yaml
+++ b/playbooks/base.yaml
@@ -13,6 +13,7 @@
 
 - hosts: "puppet:!disabled"
   roles:
+    - puppet-install
     - disable-puppet-agent
 
 - hosts: "!ci-backup:!disabled"