diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md
index 4020079a003..c4c37faca0a 100644
--- a/docs/ocis/development/testing.md
+++ b/docs/ocis/development/testing.md
@@ -74,6 +74,7 @@ To run the tests that require an email server (tests tagged with `@email`), you
 
 ```bash
 START_EMAIL=true \
+OCIS_ADD_RUN_SERVICES=notifications \
 BEHAT_FEATURE='tests/acceptance/features/apiNotification/emailNotification.feature' \
 make -C tests/acceptance/docker test-ocis-feature-ocis-storage
 ```
diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml
index fe380a958a7..732864fe9d9 100644
--- a/tests/acceptance/docker/src/acceptance.yml
+++ b/tests/acceptance/docker/src/acceptance.yml
@@ -15,7 +15,7 @@ services:
       RUN_PART: $RUN_PART
       # email
       EMAIL_HOST: email
-      EMAIL_PORT: 9000
+      EMAIL_PORT: 8025
     env_file:
       - ../../../../.drone.env
     volumes:
diff --git a/tests/acceptance/docker/src/email.yml b/tests/acceptance/docker/src/email.yml
index 330af38bd11..18781aa782d 100644
--- a/tests/acceptance/docker/src/email.yml
+++ b/tests/acceptance/docker/src/email.yml
@@ -3,6 +3,6 @@ services:
     image: dadarek/wait-for-dependencies
     depends_on:
       - email
-    command: email:9000
+    command: email:8025
   email:
-    image: inbucket/inbucket
+    image: axllent/mailpit:v1.22.3
diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml
index 4da6b626bea..4910585312b 100644
--- a/tests/acceptance/docker/src/ocis-base.yml
+++ b/tests/acceptance/docker/src/ocis-base.yml
@@ -32,7 +32,7 @@ services:
       STORAGE_USERS_S3NG_BUCKET: test
       # email
       NOTIFICATIONS_SMTP_HOST: email
-      NOTIFICATIONS_SMTP_PORT: 2500
+      NOTIFICATIONS_SMTP_PORT: 1025
       NOTIFICATIONS_SMTP_INSECURE: "true"
       NOTIFICATIONS_SMTP_SENDER: "owncloud <noreply@example.com>"