diff --git a/roles-test/puppet-install.yaml b/roles-test/puppet-install.yaml
index 7978ace6e7..e30b5ddcf8 100644
--- a/roles-test/puppet-install.yaml
+++ b/roles-test/puppet-install.yaml
@@ -10,8 +10,5 @@
     - role: puppet-install
       puppet_install_version: 4
 
-- name: Install puppet5
-  hosts: puppet5
-  roles:
-    - role: puppet-install
-      puppet_install_version: 5
\ No newline at end of file
+# NOTE(ianw) 2020-06 : we have moved away from puppet which is why we
+# don't test anything later.
diff --git a/roles/puppet-install/tasks/puppet-install/bionic.yaml b/roles/puppet-install/tasks/puppet-install/bionic.yaml
deleted file mode 100644
index 7f63c6fdf6..0000000000
--- a/roles/puppet-install/tasks/puppet-install/bionic.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Prior versions not supported on Bionic
-- fail:
-    msg: "Unsupported puppet version '{{ puppet_install_version }}' on this platform"
-  when: puppet_install_version not in [5,]
-
-- name: Install puppet 5 packages
-  when: puppet_install_version == 5
-  become: true
-  block:
-    - name: Install puppetlabs repo
-      apt:
-        deb: https://apt.puppetlabs.com/puppet5-release-bionic.deb
-
-    - name: Install puppet packages
-      apt:
-        name:
-          - puppet-agent
-          - ruby
-        update_cache: yes
-
-- name: Stop and disable puppet service
-  service:
-    name: puppet
-    state: stopped
-    enabled: no
-  become: yes
diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index 2d1124861f..5b830042f6 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -38,9 +38,6 @@
         - name: base
           label: ubuntu-bionic
       groups:
-        - name: puppet5
-          nodes:
-            - base
         - name: openafs
           nodes:
             - base