diff --git a/inventory/cloud b/inventory/cloud
index 3cd27cf820..b2928ef8d3 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -40,11 +40,9 @@ copr-keygen-dev.aws.fedoraproject.org
 #copr-be-dev.cloud.fedoraproject.org
 copr-dist-git-dev.fedorainfracloud.org
 iddev.fedorainfracloud.org
-f31-test.fedorainfracloud.org
 f32-test.fedorainfracloud.org
 f33-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
-el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
 el8-test.fedorainfracloud.org
 #aarch64-test01.fedorainfracloud.org
diff --git a/inventory/host_vars/f31-test.fedorainfracloud.org b/inventory/host_vars/f31-test.fedorainfracloud.org
deleted file mode 100644
index a9430a9e13..0000000000
--- a/inventory/host_vars/f31-test.fedorainfracloud.org
+++ /dev/null
@@ -1,2 +0,0 @@
-datacenter: aws
-inventory_hostname: "f31-test.fedorainfracloud.org"
diff --git a/inventory/inventory b/inventory/inventory
index 3848d35afe..135b117e87 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -849,11 +849,9 @@ pdc-web02.iad2.fedoraproject.org
 pdc-web01.stg.iad2.fedoraproject.org
 
 [maintainer_test]
-f31-test.fedorainfracloud.org
 f32-test.fedorainfracloud.org
 f33-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
-el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
 el8-test.fedorainfracloud.org
 ppc64le-test.fedorainfracloud.org
diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index c24b0150a2..af935d0f9b 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -70,23 +70,6 @@
   tags:
   - packages
 
-- name: check if file can be created
-  copy:
-    content: ""
-    dest: /etc/sysconfig/global-update-applied
-    force: no
-  when: inventory_hostname.startswith(('f31-test'))
-  tags:
-  - packages
-
-- name: remove test file
-  file:
-    path: /etc/sysconfig/global-update-applied
-    state: absent
-  when: inventory_hostname.startswith(('f31-test'))
-  tags:
-  - packages
-
 - name: update all
   command: dnf -y update creates=/etc/sysconfig/global-update-applied
   register: updated
@@ -94,13 +77,6 @@
   tags:
   - packages
 
-- name: update all
-  command: dnf -y
-  when: inventory_hostname.startswith(('f31-test'))
-  tags:
-  - packages
-
-
 - name: write out global-update-applied file if we updated
   copy: content="updated" dest=/etc/sysconfig/global-update-applied
   when: updated is defined