diff --git a/inventory/cloud b/inventory/cloud
index 213b625a43..e11f3c85b6 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -35,7 +35,6 @@ copr-keygen-dev.aws.fedoraproject.org
 copr-dist-git-dev.fedorainfracloud.org
 copr-pulp.aws.fedoraproject.org
 copr-pulp-dev.aws.fedoraproject.org
-f36-test.fedorainfracloud.org
 f37-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
diff --git a/inventory/host_vars/f36-test.fedorainfracloud.org b/inventory/host_vars/f36-test.fedorainfracloud.org
deleted file mode 100644
index 2501475556..0000000000
--- a/inventory/host_vars/f36-test.fedorainfracloud.org
+++ /dev/null
@@ -1,2 +0,0 @@
-datacenter: aws
-inventory_hostname: "f36-test.fedorainfracloud.org"
diff --git a/inventory/inventory b/inventory/inventory
index 68e57ebf15..cb1b1e74e6 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -882,7 +882,6 @@ pdc-web02.iad2.fedoraproject.org
 pdc-web01.stg.iad2.fedoraproject.org
 
 [maintainer_test]
-f36-test.fedorainfracloud.org
 f37-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org