diff --git a/test/compose/cdi_device/setup.sh b/test/compose/cdi_device/setup.sh
index 224caa5443..af081c2544 100644
--- a/test/compose/cdi_device/setup.sh
+++ b/test/compose/cdi_device/setup.sh
@@ -1,9 +1 @@
-if is_rootless; then
-    reason=" - can't write to /etc/cdi"
-    _show_ok skip "$testname # skip$reason"
-    exit 0
-fi
-
-mkdir -p /etc/cdi
-mount -t tmpfs tmpfs /etc/cdi
-cp device.json /etc/cdi
+cp device.json $WORKDIR/cdi
diff --git a/test/compose/cdi_device/teardown.sh b/test/compose/cdi_device/teardown.sh
deleted file mode 100644
index 770afd1269..0000000000
--- a/test/compose/cdi_device/teardown.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if ! is_rootless; then
-    umount -l /etc/cdi
-fi
diff --git a/test/compose/test-compose b/test/compose/test-compose
index ec87c291e3..07e28d4de6 100755
--- a/test/compose/test-compose
+++ b/test/compose/test-compose
@@ -198,12 +198,12 @@ function start_service() {
 
     # FIXME: use ${testname} subdir but we can't: 50-char limit in runroot
     if ! is_rootless; then
-        rm -rf $WORKDIR/{root,runroot,cni}
+        rm -rf $WORKDIR/{root,runroot,networks,cdi}
     else
-        $PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,cni}
+        $PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,networks,cdi}
     fi
     rm -f $DOCKER_SOCK
-    mkdir --mode 0755 $WORKDIR/{root,runroot,cni}
+    mkdir --mode 0755 $WORKDIR/{root,runroot,networks,cdi}
     chcon --reference=/var/lib/containers $WORKDIR/root
 
     $PODMAN_BIN \
@@ -212,7 +212,8 @@ function start_service() {
         --root $WORKDIR/root \
         --runroot $WORKDIR/runroot \
         --cgroup-manager=systemd \
-        --network-config-dir $WORKDIR/cni \
+        --network-config-dir $WORKDIR/networks \
+        --cdi-spec-dir $WORKDIR/cdi \
         system service \
         --time 0 unix://$DOCKER_SOCK \
         &> $WORKDIR/server.log &
@@ -236,10 +237,11 @@ function start_service() {
 function podman() {
     echo "\$ podman $*"           >>$WORKDIR/output.log
     output=$($PODMAN_BIN \
-	--storage-driver=vfs \
+        --storage-driver=vfs \
         --root    $WORKDIR/root    \
         --runroot $WORKDIR/runroot \
-        --network-config-dir $WORKDIR/cni \
+        --network-config-dir $WORKDIR/networks \
+        --cdi-spec-dir $WORKDIR/cdi \
         "$@")
     rc=$?
 
@@ -401,7 +403,7 @@ for t in "${tests_to_run[@]}"; do
     fi
 
     # FIXME: run 'podman ps'?
-#    rm -rf $WORKDIR/${testname}
+    #    rm -rf $WORKDIR/${testname}
 done
 
 # END   entry handler