diff --git a/inventory/host_vars/rawhide-test.fedorainfracloud.org b/inventory/host_vars/rawhide-test.fedorainfracloud.org
new file mode 100644
index 0000000000..150458175a
--- /dev/null
+++ b/inventory/host_vars/rawhide-test.fedorainfracloud.org
@@ -0,0 +1,2 @@
+datacenter: aws
+inventory_hostname: "rawhide-test.fedorainfracloud.org"
diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml
index 548de7940d..1314e97283 100644
--- a/playbooks/groups/maintainer-test.yml
+++ b/playbooks/groups/maintainer-test.yml
@@ -26,24 +26,12 @@
 
   tasks:
 
-  - name: make a partition on second disk
-    parted: device=/dev/nvme1n1 number=1 state=present
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('rawhide-test'))
-
   - name: make a partition on first disk
     parted: device=/dev/nvme0n1 number=1 state=present
     tags:
      - maintainer-test
     when: inventory_hostname.startswith(('f30-test'))
 
-  - name: format the partition if it's not already
-    filesystem: dev=/dev/nvme1n1p1 fstype=ext4
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('rawhide-test'))
-
   - name: format the partition if it's not already
     filesystem: dev=/dev/nvme0n1p1 fstype=ext4
     tags:
@@ -51,12 +39,6 @@
     when: inventory_hostname.startswith(('f30-test'))
     ignore_errors: true
 
-  - name: mount cache filesystem on /var/cache/mock
-    mount: path=/var/cache/mock state=mounted src=/dev/nvme1n1p1 fstype=ext4
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('rawhide-test'))
-
   - name: mount cache filesystem on /var/cache/mock
     mount: path=/var/cache/mock state=mounted src=/dev/nvme0n1p1 fstype=ext4
     tags:
@@ -67,7 +49,7 @@
     mount: path=/var/lib/mock state=mounted src=/var/cache/mock fstype=none opts=bind
     tags:
      - maintainer-test
-    when: inventory_hostname.startswith(('rawhide-test','f30-test'))
+    when: inventory_hostname.startswith(('f30-test'))
 
 - name: Setup maintainer test hosts
   hosts: maintainer_test:aarch64_test:armv7_test