# Pastebin LXXgoT84
diff --git a/tests/main/cgroup-devices/task.sh b/tests/main/cgroup-devices/task.sh
index fd9e9bd5f2..01c8b1c85b 100755
--- a/tests/main/cgroup-devices/task.sh
+++ b/tests/main/cgroup-devices/task.sh
@@ -12,12 +12,7 @@ touch /var/snap/test-snapd-service/common/remove-me
 snap install --dangerous ./test-snapd-service_1.0_all.snap
 # Wait for the service to really be alive and running. Otherwise the "main pid"
 # will be still tracking snap-run-confine-exec chain and be unreliable.
-for _ in $(seq 5); do
-       if [ ! -e /var/snap/test-snapd-service/common/remove-me ]; then
-               break
-       fi
-       sleep 1
-done
+retry-tool -n 5 test ! -e  /var/snap/test-snapd-service/common/remove-me
 
 echo "Extract the PID of the main process tracked by systemd"
 # It would be nicer to use "systemctl show --property=... --value" but it doesn't work on older systemd.