diff --git a/test/cloudron-backup-test.js b/test/cloudron-backup-test.js
index d8022b1..826eac4 100644
--- a/test/cloudron-backup-test.js
+++ b/test/cloudron-backup-test.js
@@ -76,13 +76,13 @@ describe('Cloudron backup testing', function () {
     });
 
     it('can send mail from cloudron user', function (done) {
-        cloudron.sendMail(owner, 'test+fromcloudron@cloudron.io', done);
+        cloudron.sendMail(owner, 'test+' + cloudron.fqdn() + '@cloudron.io', done);
     });
 
     it('did send mail from cloudron user', function (done) {
         imap.probe({
-            subject: new RegExp('^Hi from e2e test$'),
-            to: /test+fromcloudron@cloudron.io/,
+            subject: new RegExp('^Hi from e2e test - ' + cloudron.fqdn() + '$'),
+            to: new RegExp('test+' + cloudron.fqdn() + '@cloudron.io'),
             body: /This release depends on you/
         }, done);
     });