diff --git a/.redhat-ci.yml b/.redhat-ci.yml
index 818a072a..e3eb0f87 100644
--- a/.redhat-ci.yml
+++ b/.redhat-ci.yml
@@ -132,7 +132,7 @@ build:
 tests:
   - make install DESTDIR=$(pwd)/insttree
   - rsync -rl -e 'ssh -o User=root' . vmcheck:ostree/
-  - ssh root@vmcheck 'ostree admin unlock && rsync -rlv ./ostree/insttree/usr/ /usr/ && ./ostree/tests/installed/run.sh'
+  - ssh root@vmcheck './ostree/tests/installed/fah-prep.sh && ostree admin unlock && rsync -rlv ./ostree/insttree/usr/ /usr/ && ./ostree/tests/installed/run.sh'
 
 artifacts:
   - test-suite.log
diff --git a/tests/installed/fah-prep.sh b/tests/installed/fah-prep.sh
new file mode 100755
index 00000000..0db4d15e
--- /dev/null
+++ b/tests/installed/fah-prep.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -xeuo pipefail
+# If we're using devmapper, expand the root
+if lvm lvs atomicos/docker-pool &>/dev/null; then
+    systemctl stop docker
+    lvm lvremove -f atomicos/docker-pool
+fi
+lvm lvextend -r -l +100%FREE atomicos/root