diff --git a/inventory/group_vars/aarch64-test b/inventory/group_vars/aarch64-test
deleted file mode 100644
index dd7bf40d7e..0000000000
--- a/inventory/group_vars/aarch64-test
+++ /dev/null
@@ -1,14 +0,0 @@
----
-virt_install_command_one_nic: virt-install -n {{ inventory_hostname }}
-                 --memory={{ mem_size }},maxmemory={{ max_mem_size }}
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
-                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=ttyS0
-                  hostname={{ inventory_hostname }} nameserver={{ dns }}
-                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
-                 --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
-                 --autostart --noautoconsole --rng /dev/random
-
-mem_size: 4096
-num_cpus: 2
-datacenter: cloud
diff --git a/inventory/host_vars/aarch64-test01.fedorainfracloud.org b/inventory/host_vars/aarch64-test01.fedorainfracloud.org
index 75e15facf2..a1cae3763a 100644
--- a/inventory/host_vars/aarch64-test01.fedorainfracloud.org
+++ b/inventory/host_vars/aarch64-test01.fedorainfracloud.org
@@ -7,3 +7,17 @@ dns: 8.8.8.8
 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora-29-ext-aarch64
 ks_repo: http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/29/Server/aarch64/os/
 volgroup: /dev/rhel
+
+virt_install_command_one_nic: virt-install -n {{ inventory_hostname }}
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
+                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=ttyS0
+                  hostname={{ inventory_hostname }} nameserver={{ dns }}
+                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
+                 --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
+                 --autostart --noautoconsole --rng /dev/random
+
+mem_size: 4096
+num_cpus: 2
+datacenter: cloud
diff --git a/inventory/host_vars/aarch64-test02.fedorainfracloud.org b/inventory/host_vars/aarch64-test02.fedorainfracloud.org
index 1629a829c9..e25a9354ae 100644
--- a/inventory/host_vars/aarch64-test02.fedorainfracloud.org
+++ b/inventory/host_vars/aarch64-test02.fedorainfracloud.org
@@ -7,3 +7,17 @@ dns: 8.8.8.8
 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora-29-ext-aarch64
 ks_repo: http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/29/Server/aarch64/os/
 volgroup: /dev/rhel
+
+virt_install_command_one_nic: virt-install -n {{ inventory_hostname }}
+                 --memory={{ mem_size }},maxmemory={{ max_mem_size }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
+                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=ttyS0
+                  hostname={{ inventory_hostname }} nameserver={{ dns }}
+                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none'
+                 --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
+                 --autostart --noautoconsole --rng /dev/random
+
+mem_size: 4096
+num_cpus: 2
+datacenter: cloud
diff --git a/inventory/inventory b/inventory/inventory
index 16c63a7d03..ae8f6edd9f 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -12,10 +12,6 @@ qa-prod01.qa.fedoraproject.org
 [qa-stg]
 qa-stg01.qa.fedoraproject.org:222
 
-[aarch64-test]
-aarch64-test01.fedorainfracloud.org
-aarch64-test02.fedorainfracloud.org
-
 [arm-packager]
 arm03-packager00.cloud.fedoraproject.org
 arm03-packager01.cloud.fedoraproject.org
@@ -1182,6 +1178,8 @@ ppc64-test.fedorainfracloud.org
 ppc64le-test.fedorainfracloud.org
 el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
+aarch64-test01.fedorainfracloud.org
+aarch64-test02.fedorainfracloud.org
 
 [osuosl]
 proxy06.fedoraproject.org