diff --git a/test/docker/run.sh b/test/docker/run.sh
index 517baf3..8930623 100755
--- a/test/docker/run.sh
+++ b/test/docker/run.sh
@@ -59,7 +59,7 @@
 
 run_depends_on_plugin_tests() {
     docker-compose "${COMPOSE_ARGS[@]}" up --detach
-    docker-compose "${COMPOSE_ARGS[@]}" exec -T --user=gerrit_admin run_tests \
+    docker-compose "${COMPOSE_ARGS[@]}" exec -T --user=admin run_tests \
         '/depends_on/test/docker/run_tests/start.sh'
 }
 
diff --git a/test/docker/run_tests/Dockerfile b/test/docker/run_tests/Dockerfile
index 1ecd6b3..969fbb3 100755
--- a/test/docker/run_tests/Dockerfile
+++ b/test/docker/run_tests/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG UID=1000
 ARG GID=1000
-ENV USER gerrit_admin
+ENV USER admin
 ENV USER_HOME /home/$USER
 ENV WORKSPACE $USER_HOME/workspace
 
@@ -19,6 +19,6 @@
 RUN ssh-keygen -P '' -f "$USER_HOME"/.ssh/id_rsa
 RUN chmod 400 "$USER_HOME"/.ssh/id_rsa
 RUN git config --global user.name "Gerrit Admin"
-RUN git config --global user.email "gerrit_admin@example.com"
+RUN git config --global user.email "admin@example.com"
 
 ENTRYPOINT ["tail", "-f", "/dev/null"]
diff --git a/test/docker/run_tests/start.sh b/test/docker/run_tests/start.sh
index 1f4f0e4..947d534 100755
--- a/test/docker/run_tests/start.sh
+++ b/test/docker/run_tests/start.sh
@@ -17,11 +17,11 @@
 ./docker/run_tests/wait-for-it.sh "$GERRIT_HOST":"$PORT" \
     -t 60 -- echo "Gerrit is up"
 
-echo "Creating a default user account ..."
+echo "Update admin account ..."
 
 cat "$USER_HOME"/.ssh/id_rsa.pub | ssh -p 29418 -i /server-ssh-key/ssh_host_rsa_key \
-  "Gerrit Code Review@$GERRIT_HOST" suexec --as "admin@example.com" -- gerrit create-account \
-     --ssh-key - --email "gerrit_admin@localdomain"  --group "Administrators" "gerrit_admin"
+    "Gerrit Code Review@$GERRIT_HOST" suexec --as "admin@example.com" -- \
+    gerrit set-account "$USER" --add-ssh-key -
 
 setup_test_project