diff --git a/tests/docker-init.sh b/tests/docker-init.sh
index 7a0b7f1c..05add5c8 100644
--- a/tests/docker-init.sh
+++ b/tests/docker-init.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-groupadd -g $GID shimmie
+groupadd -g $GID shimmie || true
 useradd -ms /bin/bash -u $UID -g $GID shimmie
-mkdir /app/data
-chown shimmie:shimmie /app/data
+mkdir -p /app/data
+chown $UID:$GID /app/data
 export PHP_CLI_SERVER_WORKERS=8
 exec /usr/local/bin/su-exec shimmie:shimmie \
   /usr/bin/php \