diff --git a/tests/compose/core/00_create_users.sh b/tests/compose/core/00_create_users.sh
index eb214f64..d2ee5c20 100755
--- a/tests/compose/core/00_create_users.sh
+++ b/tests/compose/core/00_create_users.sh
@@ -1,5 +1,11 @@
-echo "Creating users ..."
-docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io password || exit 1
+echo "Users tests ..."
+# Should fail, admin is already auto-created
+docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io 'FooBar' && exit 1
+echo "The above error was intended!"
+# Should not fail, but does nothing; ifmissing mode
+docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io 'FooBar' --mode=ifmissing || exit 1
+# Should not fail and update the password; update mode
+docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io 'password' --mode=update || exit 1
 docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu user user mailu.io 'password' 'SHA512-CRYPT' || exit 1
 docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu user 'user/with/slash' mailu.io 'password' 'SHA512-CRYPT' || exit 1
-echo "Admin and user successfully created!"
+echo "User testing succesfull!"
diff --git a/tests/compose/core/mailu.env b/tests/compose/core/mailu.env
index d77f3a2d..dd7bd25f 100644
--- a/tests/compose/core/mailu.env
+++ b/tests/compose/core/mailu.env
@@ -140,3 +140,8 @@ REAL_IP_FROM=
 
 # choose wether mailu bounces (no) or rejects (yes) mail when recipient is unknown (value: yes, no)
 REJECT_UNLISTED_RECIPIENT=
+
+# Test for initial admin create
+INITIAL_ADMIN_ACCOUNT=admin
+INITIAL_ADMIN_DOMAIN=mailu.io
+INITIAL_ADMIN_PW=FooBar
\ No newline at end of file