diff --git a/tests/ctx_test.go b/tests/ctx_test.go
index a2efa5f7..8bee3b9d 100644
--- a/tests/ctx_test.go
+++ b/tests/ctx_test.go
@@ -263,7 +263,19 @@ func (t *testCtx) getMBoxID(userID string, name string) string {
 		}
 
 		idx := xslices.IndexFunc(labels, func(label proton.Label) bool {
-			return label.Name == name
+			var labelName string
+			switch label.Type {
+			case proton.LabelTypeSystem:
+				labelName = label.Name
+			case proton.LabelTypeFolder:
+				labelName = fmt.Sprintf("Folders/%v", label.Name)
+			case proton.LabelTypeLabel:
+				labelName = fmt.Sprintf("Labels/%v", label.Name)
+			case proton.LabelTypeContactGroup:
+				labelName = label.Name
+			}
+
+			return labelName == name
 		})
 
 		if idx < 0 {
diff --git a/tests/features/imap/mailbox/info.feature b/tests/features/imap/mailbox/info.feature
index 6cb65d79..670f0936 100644
--- a/tests/features/imap/mailbox/info.feature
+++ b/tests/features/imap/mailbox/info.feature
@@ -4,7 +4,7 @@ Feature: IMAP get mailbox info
     And the account "[user:user]" has the following custom mailboxes:
       | name | type   |
       | one  | folder |
-    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "one":
+    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Folders/one":
       | from          | to            | subject | unread |
       | a@example.com | a@example.com | one     | true   |
       | b@example.com | b@example.com | two     | false  |
diff --git a/tests/features/imap/message/delete.feature b/tests/features/imap/message/delete.feature
index 39fefe1d..ffe7619d 100644
--- a/tests/features/imap/message/delete.feature
+++ b/tests/features/imap/message/delete.feature
@@ -5,7 +5,7 @@ Feature: IMAP remove messages from mailbox
       | name  | type   |
       | mbox  | folder |
       | label | label  |
-    And the address "[user:user]@[domain]" of account "[user:user]" has 10 messages in "mbox"
+    And the address "[user:user]@[domain]" of account "[user:user]" has 10 messages in "Folders/mbox"
     And bridge starts
     And the user logs in with username "[user:user]" and password "password"
     And user "[user:user]" finishes syncing
diff --git a/tests/features/user/addressmode.feature b/tests/features/user/addressmode.feature
index eac6636c..d447a4c1 100644
--- a/tests/features/user/addressmode.feature
+++ b/tests/features/user/addressmode.feature
@@ -6,11 +6,11 @@ Feature: Address mode
       | name | type   |
       | one  | folder |
       | two  | folder |
-    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "one":
+    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Folders/one":
       | from       | to         | subject | unread |
       | a@[domain] | a@[domain] | one     | true   |
       | b@[domain] | b@[domain] | two     | false  |
-    And the address "[alias:alias]@[domain]" of account "[user:user]" has the following messages in "two":
+    And the address "[alias:alias]@[domain]" of account "[user:user]" has the following messages in "Folders/two":
       | from       | to         | subject | unread |
       | c@[domain] | c@[domain] | three   | true   |
       | d@[domain] | d@[domain] | four    | false  |
diff --git a/tests/features/user/sync.feature b/tests/features/user/sync.feature
index d1f8038a..5f0fbf91 100644
--- a/tests/features/user/sync.feature
+++ b/tests/features/user/sync.feature
@@ -6,11 +6,11 @@ Feature: Bridge can fully sync an account
       | one   | folder |
       | two   | folder |
       | three | label  |
-    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "one":
+    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Folders/one":
       | from       | to         | subject | unread |
       | a@[domain] | a@[domain] | one     | true   |
       | b@[domain] | b@[domain] | two     | false  |
-    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "two":
+    And the address "[user:user]@[domain]" of account "[user:user]" has the following messages in "Folders/two":
       | from       | to         | subject | unread |
       | a@[domain] | a@[domain] | one     | true   |
       | b@[domain] | b@[domain] | two     | false  |