diff --git a/changelogs/fragments/ansible-test-remotes.yml b/changelogs/fragments/ansible-test-remotes.yml
index 1e69052439b..fbe9f285c3b 100644
--- a/changelogs/fragments/ansible-test-remotes.yml
+++ b/changelogs/fragments/ansible-test-remotes.yml
@@ -1,3 +1,7 @@
 minor_changes:
   - ansible-test - Add RHEL 9.0 remote support.
   - ansible-test - Add FreeBSD 13.1 remote support.
+  - ansible-test - Remove RHEL 8.5 remote support.
+  - ansible-test - Remove FreeBSD 13.0 remote support.
+  - ansible-test - Remove Ubuntu 18.04 test container.
+  - ansible-test - Remove Fedora 34 test container.
diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
index cc63f0cfad9..d5d444b4da0 100644
--- a/test/lib/ansible_test/_data/completion/docker.txt
+++ b/test/lib/ansible_test/_data/completion/docker.txt
@@ -3,10 +3,8 @@ default image=quay.io/ansible/default-test-container:6.4.0 python=3.10,2.7,3.5,3
 default image=quay.io/ansible/ansible-core-test-container:6.4.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined context=ansible-core
 alpine3 image=quay.io/ansible/alpine3-test-container:4.3.0 python=3.10
 centos7 image=quay.io/ansible/centos7-test-container:4.3.0 python=2.7 seccomp=unconfined
-fedora34 image=quay.io/ansible/fedora34-test-container:4.0.0 python=3.9 seccomp=unconfined
 fedora35 image=quay.io/ansible/fedora35-test-container:4.3.0 python=3.10 seccomp=unconfined
 fedora36 image=quay.io/ansible/fedora36-test-container:4.3.0 python=3.10 seccomp=unconfined
 opensuse15 image=quay.io/ansible/opensuse15-test-container:4.3.0 python=3.6
-ubuntu1804 image=quay.io/ansible/ubuntu1804-test-container:3.1.0 python=3.6 seccomp=unconfined
 ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:4.3.0 python=3.8 seccomp=unconfined
 ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:4.3.0 python=3.10 seccomp=unconfined
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index afd64d8215d..da872da205c 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -4,13 +4,11 @@ fedora/35 python=3.10 become=sudo provider=aws arch=x86_64
 fedora/36 python=3.10 become=sudo provider=aws arch=x86_64
 fedora become=sudo provider=aws arch=x86_64
 freebsd/12.3 python=3.8 python_dir=/usr/local/bin become=su provider=aws arch=x86_64
-freebsd/13.0 python=3.7,3.8,3.9 python_dir=/usr/local/bin become=su provider=aws arch=x86_64
 freebsd/13.1 python=3.8,3.7,3.9,3.10 python_dir=/usr/local/bin become=su provider=aws arch=x86_64
 freebsd python_dir=/usr/local/bin become=su provider=aws arch=x86_64
 macos/12.0 python=3.10 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
 macos python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
 rhel/7.9 python=2.7 become=sudo provider=aws arch=x86_64
-rhel/8.5 python=3.6,3.8,3.9 become=sudo provider=aws arch=x86_64
 rhel/8.6 python=3.6,3.8,3.9 become=sudo provider=aws arch=x86_64
 rhel/9.0 python=3.9 become=sudo provider=aws arch=x86_64
 rhel become=sudo provider=aws arch=x86_64