diff --git a/playbooks/infra-puppet-functional/pre.yaml b/playbooks/infra-puppet-functional/pre.yaml
deleted file mode 100644
index db2eb4d2..00000000
--- a/playbooks/infra-puppet-functional/pre.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- hosts: all
-
-  tasks:
-  - name: Install puppet
-    command: ./install_puppet.sh
-    args:
-      chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/system-config'].src_dir }}"
-    become: yes
-
-  - name: Install modules
-    command: ./tools/install_modules_acceptance.sh
-    args:
-      chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/system-config'].src_dir }}"
-    become: yes
diff --git a/playbooks/infra-puppet-functional/run.yaml b/playbooks/infra-puppet-functional/run.yaml
deleted file mode 100644
index 7793874a..00000000
--- a/playbooks/infra-puppet-functional/run.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - infra-puppet-functional
diff --git a/roles/infra-puppet-functional/tasks/main.yaml b/roles/infra-puppet-functional/tasks/main.yaml
deleted file mode 100644
index bd05be34..00000000
--- a/roles/infra-puppet-functional/tasks/main.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- name: Get scenarios
-  command: "find {{ zuul.project.src_dir }}/tests/scenarios/ -maxdepth 1 -mindepth 1"
-  register: scenarios
-
-- name: Test scenarios
-  include: scenario.yaml
-  with_items: "{{ scenarios.stdout_lines }}"
-  loop_control:
-    loop_var: scenario
diff --git a/roles/infra-puppet-functional/tasks/scenario.yaml b/roles/infra-puppet-functional/tasks/scenario.yaml
deleted file mode 100644
index e53607b7..00000000
--- a/roles/infra-puppet-functional/tasks/scenario.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: Run puppet apply
-  command: env PATH=$PATH:/opt/puppetlabs/bin puppet apply --detailed-exitcodes {{ scenario }}/manifest.pp
-  become: yes
-  register: puppet_result
-  failed_when: puppet_result.rc != 2
-
-- name: Run puppet apply again to check for idempotence
-  command: env PATH=$PATH:/opt/puppetlabs/bin puppet apply --detailed-exitcodes {{ scenario }}/manifest.pp
-  become: yes
-  register: puppet_result
-  failed_when: puppet_result.rc != 0
-
-- name: Check results
-  command: ./{{ scenario }}/tests.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 30d3f5b5..e9a8ba37 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1233,105 +1233,6 @@
     vars:
       puppet_version: 4
 
-- job:
-    name: infra-puppet-functional
-    required-projects:
-      - openstack-infra/system-config
-      - openstack-infra/project-config
-      - openstack-infra/puppet-accessbot
-      - openstack-infra/puppet-ansible
-      - openstack-infra/puppet-apparmor
-      - openstack-infra/puppet-askbot
-      - openstack-infra/puppet-asterisk
-      - openstack-infra/puppet-bandersnatch
-      - openstack-infra/puppet-bugdaystats
-      - openstack-infra/puppet-bup
-      - openstack-infra/puppet-cgit
-      - openstack-infra/puppet-ciwatch
-      - openstack-infra/puppet-diskimage_builder
-      - openstack-infra/puppet-docker_registry
-      - openstack-infra/puppet-drupal
-      - openstack-infra/puppet-elastic_recheck
-      - openstack-infra/puppet-elasticsearch
-      - openstack-infra/puppet-ethercalc
-      - openstack-infra/puppet-etherpad_lite
-      - openstack-infra/puppet-exim
-      - openstack-infra/puppet-featuretracker
-      - openstack-infra/puppet-germqtt
-      - openstack-infra/puppet-gerrit
-      - openstack-infra/puppet-gerritbot
-      - openstack-infra/puppet-github
-      - openstack-infra/puppet-grafyaml
-      - openstack-infra/puppet-graphite
-      - openstack-infra/puppet-haveged
-      - openstack-infra/puppet-hound
-      - openstack-infra/puppet-httpd
-      - openstack-infra/puppet-infracloud
-      - openstack-infra/puppet-infra-cookiecutter
-      - openstack-infra/puppet-ipsilon
-      - openstack-infra/puppet-iptables
-      - openstack-infra/puppet-jeepyb
-      - openstack-infra/puppet-jenkins
-      - openstack-infra/puppet-kerberos
-      - openstack-infra/puppet-kibana
-      - openstack-infra/puppet-lodgeit
-      - openstack-infra/puppet-log_processor
-      - openstack-infra/puppet-logrotate
-      - openstack-infra/puppet-logstash
-      - openstack-infra/puppet-lpmqtt
-      - openstack-infra/puppet-mailman
-      - openstack-infra/puppet-mediawiki
-      - openstack-infra/puppet-meetbot
-      - openstack-infra/puppet-mosquitto
-      - openstack-infra/puppet-mqtt_statsd
-      - openstack-infra/puppet-mysql_backup
-      - openstack-infra/puppet-nodepool
-      - openstack-infra/puppet-odsreg
-      - openstack-infra/puppet-openafs
-      - openstack-infra/puppet-openstackci
-      - openstack-infra/puppet-openstack_health
-      - openstack-infra/puppet-openstackid
-      - openstack-infra/puppet-openstack_infra_spec_helper
-      - openstack-infra/puppet-os_client_config
-      - openstack-infra/puppet-packagekit
-      - openstack-infra/puppet-pgsql_backup
-      - openstack-infra/puppet-phabricator
-      - openstack-infra/puppet-pip
-      - openstack-infra/puppet-planet
-      - openstack-infra/puppet-project_config
-      - openstack-infra/puppet-ptgbot
-      - openstack-infra/puppet-puppet
-      - openstack-infra/puppet-redis
-      - openstack-infra/puppet-refstack
-      - openstack-infra/puppet-releasestatus
-      - openstack-infra/puppet-reviewday
-      - openstack-infra/puppet-simpleproxy
-      - openstack-infra/puppet-snmpd
-      - openstack-infra/puppet-ssh
-      - openstack-infra/puppet-ssl_cert_check
-      - openstack-infra/puppet-stackalytics
-      - openstack-infra/puppet-statusbot
-      - openstack-infra/puppet-storyboard
-      - openstack-infra/puppet-subunit2sql
-      - openstack-infra/puppet-sudoers
-      - openstack-infra/puppet-tmpreaper
-      - openstack-infra/puppet-translation_checksite
-      - openstack-infra/puppet-ulimit
-      - openstack-infra/puppet-unattended_upgrades
-      - openstack-infra/puppet-unbound
-      - openstack-infra/puppet-user
-      - openstack-infra/puppet-vcsrepo
-      - openstack-infra/puppet-vinz
-      - openstack-infra/puppet-yum
-      - openstack-infra/puppet-zanata
-      - openstack-infra/puppet-zuul
-    pre-run: playbooks/infra-puppet-functional/pre.yaml
-    run: playbooks/infra-puppet-functional/run.yaml
-
-- job:
-    name: infra-puppet-functional-3-ubuntu-xenial
-    parent: infra-puppet-functional
-
 - job:
     name: ansible-role-functional-base
     abstract: true
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 0fba33be..dd5f7845 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -64,9 +64,6 @@
         - legacy-openstackci-beaker-ubuntu-trusty
         - infra-puppet-apply-4-centos-7
         - infra-puppet-apply-4-ubuntu-xenial
-    experimental:
-      jobs:
-        - infra-puppet-functional-3-ubuntu-xenial
 
 - project-template:
     name: infra-puppet-check-jobs