diff --git a/test/test-files/auth/imap-oauth2-auth.txt b/test/test-files/auth/imap-oauth2-auth.txt
index bd4cf150..ec738bbc 100644
--- a/test/test-files/auth/imap-oauth2-auth.txt
+++ b/test/test-files/auth/imap-oauth2-auth.txt
@@ -1,3 +1,4 @@
+a0 NOOP See ...
 a1 AUTHENTICATE XOAUTH2 dXNlcj11c2VyMUBsb2NhbGhvc3QubG9jYWxkb21haW4BYXV0aD1CZWFyZXIgZXlKaGJHY2lPaUpTVXpJMU5pSXNJblI1Y0NJNklrcFhWQ0o5LmV5SnBjM01pT2lKb2RIUndPaTh2Y0hKdmRtbGtaWEl1WlhoaGJYQnNaUzUwWlhOME9qZ3dNREF2SWl3aWMzVmlJam9pT0RKak1XTXpNelJrWTJNMlpUTXhNV0ZsTkdGaFpXSm1aVGswTm1NMVpUZzFPR1l3TlRWaFptWXhZMlUxWVRNM1lXRTNZMk01TVdGaFlqRTNaVE0xWXlJc0ltRjFaQ0k2SW0xaGFXeHpaWEoyWlhJaUxDSjFhV1FpT2lJNE9VNHpSME51TjFNMVkwOTBXa1pOUlRWQmVWaE5ibXhVUkZkVmNuRXpSbWQ0WVdseVdXaEZJbjAuenVDeXRBcmJwaGhKbjlYVF95OWNCZEdxRENObzY4dEJydE93UElzdUtOeUYzNDBTYU91WmEweGFyWm9meWd5dGREcEx0WXI1NlFsUFRLSW1pLW4xWldySGtSWmt3clFpNWpRLWpfbjJoRUFMMHZVVG9MYkRuWFlmYzVxMnc3ejdYMGFvQ21pSzgtZlY3S3g0Q1ZUTTdyaUJncEVsZjZGM3dOQUljWDZSMWlqVWg2SVNDTDBYWXNkb2dmOFdVTlppcFhZLU80UjdZSFhkT0VOdU9wM0c0OGhXaHh1VWg5UHNVcUU1eXhEd0xzT1Z6Q1RxZzlTNWd4UFF6RjJlQ045SjBJMlhpSWxMS3ZMUVBJWjJZX0s3aVl2VndqcE5kZ2I0eGhtOXd1S29JVmluWWtGXzZDd0l6QWF3QldJREpBYml4MUlzbGtVUFFNR2J1cFREdE9nVGlRAQE=
 a2 EXAMINE INBOX
 a3 LOGOUT
diff --git a/test/tests/serial/mail_with_oauth2.bats b/test/tests/serial/mail_with_oauth2.bats
index c204e45e..30be8fdd 100644
--- a/test/tests/serial/mail_with_oauth2.bats
+++ b/test/tests/serial/mail_with_oauth2.bats
@@ -19,9 +19,7 @@ function setup_file() {
   docker run --rm -d --name "${CONTAINER2_NAME}" \
     --hostname "${FQDN_OAUTH2}" \
     --network "${DMS_TEST_NETWORK}" \
-    --user "$(id -u):$(id -g)" \
     --volume "${REPOSITORY_ROOT}/test/config/oauth2/:/app/" \
-    --expose 80 \
     docker.io/library/python:latest \
     python /app/provider.py
 
@@ -31,6 +29,7 @@ function setup_file() {
   # Setup DMS container
   #
 
+  # Add OAUTH2 configuration so that Dovecot can reach out to our mock provider (CONTAINER2)
   local ENV_OAUTH2_CONFIG=(
     --env ENABLE_OAUTH2=1
     --env OAUTH2_CLIENT_ID=mailserver
@@ -38,14 +37,9 @@ function setup_file() {
     --env OAUTH2_INTROSPECTION_URL=http://oauth2.example.test/
   )
 
-  local ENV_SUPPORT=(
-    --env PERMIT_DOCKER=container
-  )
-
   export CONTAINER_NAME=${CONTAINER1_NAME}
   local CUSTOM_SETUP_ARGUMENTS=(
     "${ENV_OAUTH2_CONFIG[@]}"
-    "${ENV_SUPPORT[@]}"
 
     --hostname "${FQDN_MAIL}"
     --network "${DMS_TEST_NETWORK}"