diff --git a/testinfra/test_base.py b/testinfra/test_base.py
index d5a88510e1..5a6eb8c6d1 100644
--- a/testinfra/test_base.py
+++ b/testinfra/test_base.py
@@ -39,29 +39,18 @@ def test_iptables(host):
 
 def test_ntp(host):
     package = host.package("ntp")
-    if host.system_info.codename in ('xenial'):
-        assert package.is_installed
+    assert not package.is_installed
 
-        if host.system_info.distribution in ['ubuntu', 'debian']:
-            service = host.service("ntp")
-        else:
-            service = host.service("ntpd")
-        assert service.is_running
-        assert service.is_enabled
+    service = host.service('systemd-timesyncd')
+    assert service.is_running
 
+    # Focal updates the status string to just say NTP
+    if host.system_info.codename == 'bionic':
+        stdout_string = 'systemd-timesyncd.service active'
     else:
-        assert not package.is_installed
-
-        service = host.service('systemd-timesyncd')
-        assert service.is_running
-
-        # Focal updates the status string to just say NTP
-        if host.system_info.codename == 'bionic':
-            stdout_string = 'systemd-timesyncd.service active'
-        else:
-            stdout_string = 'NTP service: active'
-        cmd = host.run("timedatectl status")
-        assert stdout_string in cmd.stdout
+        stdout_string = 'NTP service: active'
+    cmd = host.run("timedatectl status")
+    assert stdout_string in cmd.stdout
 
 
 def test_snmp(host):
diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index f9dd6796f8..0ab8648668 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -26,23 +26,6 @@
         # for build logs
         '/var/lib/dkms-make-logs': logs
 
-- job:
-    name: system-config-zuul-role-integration-xenial
-    parent: system-config-zuul-role-integration
-    nodeset:
-      nodes:
-        - name: base
-          label: ubuntu-xenial
-        - name: puppet4
-          label: ubuntu-xenial
-      groups:
-        - name: puppet3
-          nodes:
-            - base
-        - name: openafs
-          nodes:
-            - base
-
 - job:
     name: system-config-zuul-role-integration-bionic
     parent: system-config-zuul-role-integration
@@ -216,7 +199,6 @@
     name: system-config-zuul-role-integration
     check:
       jobs:
-        - system-config-zuul-role-integration-xenial
         - system-config-zuul-role-integration-bionic
         - system-config-zuul-role-integration-bionic-arm64
         - system-config-zuul-role-integration-focal
@@ -236,7 +218,6 @@
         - system-config-zuul-role-integration-centos-9-stream-arm64
     gate:
       jobs:
-        - system-config-zuul-role-integration-xenial
         - system-config-zuul-role-integration-bionic
         - system-config-zuul-role-integration-bionic-arm64
         - system-config-zuul-role-integration-focal
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 4dac949087..6dd62932b6 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -60,8 +60,6 @@
     nodeset:
       nodes:
         - &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy }
-        - name: xenial
-          label: ubuntu-xenial
         - name: bionic
           label: ubuntu-bionic
         - name: focal
@@ -99,8 +97,6 @@
     nodeset:
       nodes:
         - <<: *bridge_node_x86
-        - name: xenial
-          label: ubuntu-xenial
         - name: bionic
           label: ubuntu-bionic
         - name: focal