diff --git a/tests/_features/imap/mailbox/create.feature b/tests/_features/imap/mailbox/create.feature
deleted file mode 100644
index 77e84960..00000000
--- a/tests/_features/imap/mailbox/create.feature
+++ /dev/null
@@ -1,50 +0,0 @@
-Feature: IMAP create mailbox
-  Background:
-    Given there is connected user "user"
-    And there is IMAP client logged in as "user"
-    And "user" does not have mailbox "Folders/mbox"
-    And "user" does not have mailbox "Labels/mbox"
-
-  Scenario: Create folder
-    When IMAP client creates mailbox "Folders/mbox"
-    Then IMAP response is "OK"
-    And "user" has mailbox "Folders/mbox"
-    And "user" does not have mailbox "Labels/mbox"
-
-  Scenario: Create label
-    When IMAP client creates mailbox "Labels/mbox"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "Folders/mbox"
-    And "user" has mailbox "Labels/mbox"
-
-  Scenario: Creating label with existing name is not possible
-    Given there is "user" with mailbox "Folders/mbox"
-    When IMAP client creates mailbox "Labels/mbox"
-    Then IMAP response is "IMAP error: NO A label or folder with this name already exists"
-    And "user" has mailbox "Folders/mbox"
-    And "user" does not have mailbox "Labels/mbox"
-
-  Scenario: Creating folder with existing name is not possible
-    Given there is "user" with mailbox "Labels/mbox"
-    When IMAP client creates mailbox "Folders/mbox"
-    Then IMAP response is "IMAP error: NO A label or folder with this name already exists"
-    And "user" has mailbox "Labels/mbox"
-    And "user" does not have mailbox "Folders/mbox"
-
-  Scenario: Creating system mailbox is not possible
-    When IMAP client creates mailbox "INBOX"
-    Then IMAP response is "IMAP error: NO mailbox INBOX already exists"
-    When IMAP client creates mailbox "Folders/INBOX"
-    Then IMAP response is "IMAP error: NO Invalid name"
-    # API allows you to create custom folder with naem `All Mail`
-    #When IMAP client creates mailbox "Folders/All mail"
-    #Then IMAP response is "IMAP error: NO mailbox All Mail already exists"
-
-  Scenario: Creating mailbox without prefix is not possible
-    When IMAP client creates mailbox "mbox"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "mbox"
-    When All mail mailbox is hidden
-    And IMAP client creates mailbox "All mail"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "All mail"
diff --git a/tests/_features/imap/mailbox/delete.feature b/tests/_features/imap/mailbox/delete.feature
deleted file mode 100644
index c825aeff..00000000
--- a/tests/_features/imap/mailbox/delete.feature
+++ /dev/null
@@ -1,29 +0,0 @@
-Feature: IMAP delete mailbox
-  Background:
-    Given there is connected user "user"
-
-  Scenario: Delete folder
-    Given there is "user" with mailbox "Folders/mbox"
-    And there is IMAP client logged in as "user"
-    When IMAP client deletes mailbox "Folders/mbox"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "Folders/mbox"
-
-  Scenario: Delete label
-    Given there is "user" with mailbox "Labels/mbox"
-    And there is IMAP client logged in as "user"
-    When IMAP client deletes mailbox "Labels/mbox"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "Labels/mbox"
-
-  Scenario: Empty Trash by deleting it
-    Given there are 10 messages in mailbox "Trash" for "user"
-    And there is IMAP client logged in as "user"
-    When IMAP client deletes mailbox "Trash"
-    Then IMAP response is "OK"
-    And mailbox "Trash" for "user" has 0 messages
-
-  Scenario: Deleting system mailbox is not possible
-    Given there is IMAP client logged in as "user"
-    When IMAP client deletes mailbox "INBOX"
-    Then IMAP response is "IMAP error: NO cannot empty mailbox 0"
diff --git a/tests/_features/imap/mailbox/info.feature b/tests/_features/imap/mailbox/info.feature
deleted file mode 100644
index b691fbdf..00000000
--- a/tests/_features/imap/mailbox/info.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-Feature: IMAP get mailbox info
-  Background:
-    Given there is connected user "user"
-    And there are messages in mailbox "INBOX" for "user"
-      | from              | to         | subject | body  | read  | starred |
-      | john.doe@mail.com | user@pm.me | foo     | hello | false | false   |
-      | jane.doe@mail.com | name@pm.me | bar     | world | true  | true    |
-    And there is IMAP client logged in as "user"
-
-  Scenario: Mailbox info contains mailbox name
-    When IMAP client gets info of "INBOX"
-    Then IMAP response contains "2 EXISTS"
-    And IMAP response contains "UNSEEN 1"
-    And IMAP response contains "UIDNEXT 3"
-    And IMAP response contains "UIDVALIDITY"
diff --git a/tests/_features/imap/mailbox/list.feature b/tests/_features/imap/mailbox/list.feature
deleted file mode 100644
index 845e4ea3..00000000
--- a/tests/_features/imap/mailbox/list.feature
+++ /dev/null
@@ -1,143 +0,0 @@
-Feature: IMAP list mailboxes
-  Background:
-    Given there is connected user "user"
-
-  Scenario: List mailboxes
-    Given there is "user" with mailbox "Folders/mbox1"
-    And there is "user" with mailbox "Labels/mbox2"
-    And there is IMAP client logged in as "user"
-    When IMAP client lists mailboxes
-    Then IMAP response contains "INBOX"
-    Then IMAP response contains "Sent"
-    Then IMAP response contains "Archive"
-    Then IMAP response contains "Trash"
-    Then IMAP response contains "All Mail"
-    Then IMAP response contains "Folders/mbox1"
-    Then IMAP response contains "Labels/mbox2"
-
-  Scenario: List mailboxes without All Mail
-    Given there is IMAP client logged in as "user"
-    When IMAP client lists mailboxes
-    Then IMAP response contains "INBOX"
-    Then IMAP response contains "Sent"
-    Then IMAP response contains "Archive"
-    Then IMAP response contains "Trash"
-    Then IMAP response contains "All Mail"
-    When All mail mailbox is hidden
-    And IMAP client lists mailboxes
-    Then IMAP response contains "INBOX"
-    Then IMAP response contains "Sent"
-    Then IMAP response contains "Archive"
-    Then IMAP response contains "Trash"
-    Then IMAP response doesn't contain "All Mail"
-    When All mail mailbox is visible
-    And IMAP client lists mailboxes
-    Then IMAP response contains "INBOX"
-    Then IMAP response contains "Sent"
-    Then IMAP response contains "Archive"
-    Then IMAP response contains "Trash"
-    Then IMAP response contains "All Mail"
-
-  Scenario: List multiple times in parallel without crash
-    Given there is "user" with mailboxes
-      | Folders/mbox1  |
-      | Folders/mbox2  |
-      | Folders/mbox3  |
-      | Folders/mbox4  |
-      | Folders/mbox5  |
-      | Folders/mbox6  |
-      | Folders/mbox7  |
-      | Folders/mbox8  |
-      | Folders/mbox9  |
-      | Folders/mbox10 |
-      | Folders/mbox11 |
-      | Folders/mbox12 |
-      | Folders/mbox13 |
-      | Folders/mbox14 |
-      | Folders/mbox15 |
-      | Folders/mbox16 |
-      | Folders/mbox17 |
-      | Folders/mbox18 |
-      | Folders/mbox19 |
-      | Folders/mbox20 |
-      | Labels/lab1  |
-      | Labels/lab2  |
-      | Labels/lab3  |
-      | Labels/lab4  |
-      | Labels/lab5  |
-      | Labels/lab6  |
-      | Labels/lab7  |
-      | Labels/lab8  |
-      | Labels/lab9  |
-      | Labels/lab10 |
-      | Labels/lab11 |
-      | Labels/lab12 |
-      | Labels/lab13 |
-      | Labels/lab14 |
-      | Labels/lab15 |
-      | Labels/lab16 |
-      | Labels/lab17 |
-      | Labels/lab18 |
-      | Labels/lab19 |
-      | Labels/lab20 |
-      | Labels/lab1.1  |
-      | Labels/lab1.2  |
-      | Labels/lab1.3  |
-      | Labels/lab1.4  |
-      | Labels/lab1.5  |
-      | Labels/lab1.6  |
-      | Labels/lab1.7  |
-      | Labels/lab1.8  |
-      | Labels/lab1.9  |
-      | Labels/lab1.10 |
-      | Labels/lab1.11 |
-      | Labels/lab1.12 |
-      | Labels/lab1.13 |
-      | Labels/lab1.14 |
-      | Labels/lab1.15 |
-      | Labels/lab1.16 |
-      | Labels/lab1.17 |
-      | Labels/lab1.18 |
-      | Labels/lab1.19 |
-      | Labels/lab1.20 |
-      | Labels/lab2.1  |
-      | Labels/lab2.2  |
-      | Labels/lab2.3  |
-      | Labels/lab2.4  |
-      | Labels/lab2.5  |
-      | Labels/lab2.6  |
-      | Labels/lab2.7  |
-      | Labels/lab2.8  |
-      | Labels/lab2.9  |
-      | Labels/lab2.10 |
-      | Labels/lab2.11 |
-      | Labels/lab2.12 |
-      | Labels/lab2.13 |
-      | Labels/lab2.14 |
-      | Labels/lab2.15 |
-      | Labels/lab2.16 |
-      | Labels/lab2.17 |
-      | Labels/lab2.18 |
-      | Labels/lab2.19 |
-      | Labels/lab2.20 |
-    And there is IMAP client "A" logged in as "user"
-    And there is IMAP client "B" logged in as "user"
-    When  IMAP client "A" lists mailboxes
-    And  IMAP client "B" lists mailboxes
-    Then IMAP response to "A" is "OK"
-    And IMAP response to "A" contains "mbox1"
-    And IMAP response to "A" contains "mbox10"
-    And IMAP response to "A" contains "mbox20"
-
-  @ignore-live
-  Scenario: List mailboxes with subfolders
-    # Escaped slash in the name contains slash in the name.
-    # Not-escaped slash in the name means tree structure.
-    # We keep escaping in an IMAP communication so each mailbox is unique and
-    # both mailboxes are accessible. The slash is visible in the IMAP client.
-    Given there is "user" with mailbox "Folders/a\/b"
-    And there is "user" with mailbox "Folders/a/b"
-    And there is IMAP client logged in as "user"
-    When IMAP client lists mailboxes
-    Then IMAP response contains "Folders/a\/b"
-    Then IMAP response contains "Folders/a/b"
diff --git a/tests/_features/imap/mailbox/rename.feature b/tests/_features/imap/mailbox/rename.feature
deleted file mode 100644
index 495ab26d..00000000
--- a/tests/_features/imap/mailbox/rename.feature
+++ /dev/null
@@ -1,30 +0,0 @@
-Feature: IMAP mailbox rename
-  Background:
-    Given there is connected user "user"
-
-  Scenario: Rename folder
-    Given there is "user" with mailbox "Folders/mbox"
-    And there is IMAP client logged in as "user"
-    When IMAP client renames mailbox "Folders/mbox" to "Folders/mbox2"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "Folders/mbox"
-    And "user" has mailbox "Folders/mbox2"
-
-  Scenario: Rename label
-    Given there is "user" with mailbox "Labels/mbox"
-    And there is IMAP client logged in as "user"
-    When IMAP client renames mailbox "Labels/mbox" to "Labels/mbox2"
-    Then IMAP response is "OK"
-    And "user" does not have mailbox "Labels/mbox"
-    And "user" has mailbox "Labels/mbox2"
-
-  Scenario: Renaming folder to label is not possible
-    Given there is "user" with mailbox "Folders/mbox"
-    And there is IMAP client logged in as "user"
-    When IMAP client renames mailbox "Folders/mbox" to "Labels/mbox"
-    Then IMAP response is "IMAP error: NO cannot rename folder to non-folder"
-
-  Scenario: Renaming system folder is not possible
-    Given there is IMAP client logged in as "user"
-    When IMAP client renames mailbox "INBOX" to "Folders/mbox"
-    Then IMAP response is "IMAP error: NO cannot rename system mailboxes"
diff --git a/tests/_features/imap/mailbox/select.feature b/tests/_features/imap/mailbox/select.feature
deleted file mode 100644
index 983cf572..00000000
--- a/tests/_features/imap/mailbox/select.feature
+++ /dev/null
@@ -1,17 +0,0 @@
-Feature: IMAP select into mailbox
-  Background:
-    Given there is connected user "user"
-    And there is "user" with mailbox "Folders/mbox"
-    And there is IMAP client logged in as "user"
-
-  Scenario: Select into inbox
-    When IMAP client selects "INBOX"
-    Then IMAP response is "OK"
-
-  Scenario: Select into custom mailbox
-    When IMAP client selects "Folders/mbox"
-    Then IMAP response is "OK"
-
-  Scenario: Select into non-existing mailbox
-    When IMAP client selects "qwerty"
-    Then IMAP response is "IMAP error: NO mailbox qwerty does not exist"
diff --git a/tests/_features/imap/mailbox/status.feature b/tests/_features/imap/mailbox/status.feature
deleted file mode 100644
index bba887c9..00000000
--- a/tests/_features/imap/mailbox/status.feature
+++ /dev/null
@@ -1,20 +0,0 @@
-Feature: IMAP get mailbox status
-  Background:
-    Given there is connected user "user"
-    And there are messages in mailbox "INBOX" for "user"
-      | from              | to         | subject | body  | read  | starred |
-      | john.doe@mail.com | user@pm.me | foo     | hello | false | false   |
-      | jane.doe@mail.com | name@pm.me | bar     | world | true  | true    |
-    And there is IMAP client logged in as "user"
-    And there is IMAP client selected in "INBOX"
-
-  Scenario: Mailbox status contains mailbox name
-    When IMAP client gets status of "INBOX"
-    Then IMAP response contains "INBOX"
-
-  Scenario: Mailbox status contains counts and UIDs
-    When IMAP client gets status of "INBOX"
-    And IMAP response contains "MESSAGES 2"
-    And IMAP response contains "UNSEEN 1"
-    And IMAP response contains "UIDNEXT 3"
-    And IMAP response contains "UIDVALIDITY"