diff --git a/.gitignore b/.gitignore
index 1760744ba1..889975bc75 100755
--- a/.gitignore
+++ b/.gitignore
@@ -62,8 +62,8 @@ translations/messages
 translations/reports
 
 # 'Screenshots' and 'Paper wallet ceritifcate PDF file' generated by acceptance tests
-features/tests/ui/documents/paper_wallet_certificates/paper-wallet-certificate.pdf
-features/tests/ui/screenshots
+features/tests/e2e/documents/paper_wallet_certificates/paper-wallet-certificate.pdf
+features/tests/e2e/screenshots
 
 # Webpack
 .cache
diff --git a/features/about-dialog.feature b/features/about-dialog.feature
index da8dc50858..6ae4b37744 100644
--- a/features/about-dialog.feature
+++ b/features/about-dialog.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: About Dialog
 
   Background:
diff --git a/features/accept-terms-of-use.feature b/features/accept-terms-of-use.feature
index fb82fad60c..76c814e17a 100644
--- a/features/accept-terms-of-use.feature
+++ b/features/accept-terms-of-use.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Accept "Terms of use"
 
   Background:
diff --git a/features/ada-redemption.feature b/features/ada-redemption.feature
index 44116afb2e..a5ad99a4c7 100644
--- a/features/ada-redemption.feature
+++ b/features/ada-redemption.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Ada Redemption
 
   Background:
diff --git a/features/add-wallet-via-sidebar.feature b/features/add-wallet-via-sidebar.feature
index 132b2722d5..f9eb4c0559 100644
--- a/features/add-wallet-via-sidebar.feature
+++ b/features/add-wallet-via-sidebar.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Add Wallet via Sidebar
 
   Background:
diff --git a/features/block-consolidation-page.feature b/features/block-consolidation-page.feature
index 0cf8127150..a5dc84cc02 100644
--- a/features/block-consolidation-page.feature
+++ b/features/block-consolidation-page.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Display Block Consolidation Page
 
   Background:
diff --git a/features/data-layer-migration.feature b/features/data-layer-migration.feature
index 17fe265710..71b8491821 100644
--- a/features/data-layer-migration.feature
+++ b/features/data-layer-migration.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Data Layer Migration
 
   Background:
diff --git a/features/delete-wallet-via-settings.feature b/features/delete-wallet-via-settings.feature
index e84a1b5959..258d3bbfa6 100644
--- a/features/delete-wallet-via-settings.feature
+++ b/features/delete-wallet-via-settings.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Delete Wallet via Settings
 
   Background:
diff --git a/features/import-wallet-via-sidebar.feature b/features/import-wallet-via-sidebar.feature
index 433fa084a4..00c772d0d3 100644
--- a/features/import-wallet-via-sidebar.feature
+++ b/features/import-wallet-via-sidebar.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Import Wallet via Sidebar
 
   Background:
diff --git a/features/local-time-difference.feature b/features/local-time-difference.feature
index 006854bb9f..10a960726d 100644
--- a/features/local-time-difference.feature
+++ b/features/local-time-difference.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Local Time Difference
 
   Scenario: Wrong local time
diff --git a/features/navigate-general-settings-menu.feature b/features/navigate-general-settings-menu.feature
index 3b5f1ef83e..c484ce6e31 100644
--- a/features/navigate-general-settings-menu.feature
+++ b/features/navigate-general-settings-menu.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: General Settings
 
   Background:
diff --git a/features/navigate-sidebar-categories.feature b/features/navigate-sidebar-categories.feature
index 415cf66291..002f9895ed 100644
--- a/features/navigate-sidebar-categories.feature
+++ b/features/navigate-sidebar-categories.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Navigate Sidebar Categories
 
   Background:
diff --git a/features/navigate-wallet-tabs.feature b/features/navigate-wallet-tabs.feature
index 4eaddef930..1ff73a12d0 100644
--- a/features/navigate-wallet-tabs.feature
+++ b/features/navigate-wallet-tabs.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Navigate Wallet Tabs
 
   Background:
diff --git a/features/no-disk-space.feature b/features/no-disk-space.feature
index 23c4c052cd..68999090ab 100644
--- a/features/no-disk-space.feature
+++ b/features/no-disk-space.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: No Disk Space Overlay
 
   Background:
diff --git a/features/node-update-exit.feature b/features/node-update-exit.feature
index 2102d160eb..e964339252 100644
--- a/features/node-update-exit.feature
+++ b/features/node-update-exit.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Node Update Exit
 
   Background:
diff --git a/features/node-update-notification.feature b/features/node-update-notification.feature
index c4eb207dff..8e9c948c03 100644
--- a/features/node-update-notification.feature
+++ b/features/node-update-notification.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Node Update Notification
 
   Background:
diff --git a/features/paper-wallets-certificate.feature b/features/paper-wallets-certificate.feature
index f2731b0944..8b83560cf7 100644
--- a/features/paper-wallets-certificate.feature
+++ b/features/paper-wallets-certificate.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Paper Wallets Certificate generation
 
   Background:
diff --git a/features/quit-app.feature b/features/quit-app.feature
index d999abb6d5..143e56855f 100644
--- a/features/quit-app.feature
+++ b/features/quit-app.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Quitting Daedalus
 
   Daedalus can be quit in multiple (and unexpected) ways and
diff --git a/features/receive-money.feature b/features/receive-money.feature
index 2ff226547f..6f7e71222a 100644
--- a/features/receive-money.feature
+++ b/features/receive-money.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Receive money
 
   Background:
diff --git a/features/restore-wallet-via-sidebar.feature b/features/restore-wallet-via-sidebar.feature
index d231961bbe..6510def383 100644
--- a/features/restore-wallet-via-sidebar.feature
+++ b/features/restore-wallet-via-sidebar.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Add Wallet via Sidebar
 
   Background:
diff --git a/features/select-language.feature b/features/select-language.feature
index 42fcd28141..ff0f2a68d6 100644
--- a/features/select-language.feature
+++ b/features/select-language.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Select Language
 
   Scenario: User Selects Language
diff --git a/features/send-money-to-receiver.feature b/features/send-money-to-receiver.feature
index f5521cdb68..08f54e5970 100644
--- a/features/send-money-to-receiver.feature
+++ b/features/send-money-to-receiver.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Send Money to Receiver
 
   Background:
diff --git a/features/switching-between-wallets.feature b/features/switching-between-wallets.feature
index 6e4cbd6cb0..d565002fa2 100644
--- a/features/switching-between-wallets.feature
+++ b/features/switching-between-wallets.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Switching Between Wallets
 
   Background:
diff --git a/features/tests/ui/documents/ada_certificates/force-vended.pdf b/features/tests/e2e/documents/ada_certificates/force-vended.pdf
similarity index 100%
rename from features/tests/ui/documents/ada_certificates/force-vended.pdf
rename to features/tests/e2e/documents/ada_certificates/force-vended.pdf
diff --git a/features/tests/ui/documents/ada_certificates/force-vended.pdf.enc b/features/tests/e2e/documents/ada_certificates/force-vended.pdf.enc
similarity index 100%
rename from features/tests/ui/documents/ada_certificates/force-vended.pdf.enc
rename to features/tests/e2e/documents/ada_certificates/force-vended.pdf.enc
diff --git a/features/tests/ui/documents/ada_certificates/regular.pdf b/features/tests/e2e/documents/ada_certificates/regular.pdf
similarity index 100%
rename from features/tests/ui/documents/ada_certificates/regular.pdf
rename to features/tests/e2e/documents/ada_certificates/regular.pdf
diff --git a/features/tests/ui/documents/ada_certificates/regular.pdf.enc b/features/tests/e2e/documents/ada_certificates/regular.pdf.enc
similarity index 100%
rename from features/tests/ui/documents/ada_certificates/regular.pdf.enc
rename to features/tests/e2e/documents/ada_certificates/regular.pdf.enc
diff --git a/features/tests/ui/documents/default-wallet.json b/features/tests/e2e/documents/default-wallet.json
similarity index 100%
rename from features/tests/ui/documents/default-wallet.json
rename to features/tests/e2e/documents/default-wallet.json
diff --git a/features/tests/ui/documents/default-wallet.key b/features/tests/e2e/documents/default-wallet.key
similarity index 100%
rename from features/tests/ui/documents/default-wallet.key
rename to features/tests/e2e/documents/default-wallet.key
diff --git a/features/tests/ui/documents/default-wallet.key.lock b/features/tests/e2e/documents/default-wallet.key.lock
similarity index 100%
rename from features/tests/ui/documents/default-wallet.key.lock
rename to features/tests/e2e/documents/default-wallet.key.lock
diff --git a/features/tests/ui/documents/paper_wallet_certificates/.gitkeep b/features/tests/e2e/documents/paper_wallet_certificates/.gitkeep
similarity index 100%
rename from features/tests/ui/documents/paper_wallet_certificates/.gitkeep
rename to features/tests/e2e/documents/paper_wallet_certificates/.gitkeep
diff --git a/features/tests/e2e/documents/paper_wallet_certificates/paper-wallet-certificate.pdf b/features/tests/e2e/documents/paper_wallet_certificates/paper-wallet-certificate.pdf
new file mode 100644
index 0000000000..7fdb4a9ad2
Binary files /dev/null and b/features/tests/e2e/documents/paper_wallet_certificates/paper-wallet-certificate.pdf differ
diff --git a/features/tests/ui/helpers/add-wallet-page-helpers.js b/features/tests/e2e/helpers/add-wallet-page-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/add-wallet-page-helpers.js
rename to features/tests/e2e/helpers/add-wallet-page-helpers.js
diff --git a/features/tests/ui/helpers/app-helpers.js b/features/tests/e2e/helpers/app-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/app-helpers.js
rename to features/tests/e2e/helpers/app-helpers.js
diff --git a/features/tests/ui/helpers/cardano-node-helpers.js b/features/tests/e2e/helpers/cardano-node-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/cardano-node-helpers.js
rename to features/tests/e2e/helpers/cardano-node-helpers.js
diff --git a/features/tests/ui/helpers/data-layer-migration-helpers.js b/features/tests/e2e/helpers/data-layer-migration-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/data-layer-migration-helpers.js
rename to features/tests/e2e/helpers/data-layer-migration-helpers.js
diff --git a/features/tests/ui/helpers/dialogs/import-wallet-dialog-helpers.js b/features/tests/e2e/helpers/dialogs/import-wallet-dialog-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/dialogs/import-wallet-dialog-helpers.js
rename to features/tests/e2e/helpers/dialogs/import-wallet-dialog-helpers.js
diff --git a/features/tests/ui/helpers/i18n-helpers.js b/features/tests/e2e/helpers/i18n-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/i18n-helpers.js
rename to features/tests/e2e/helpers/i18n-helpers.js
diff --git a/features/tests/ui/helpers/language-selection-helpers.js b/features/tests/e2e/helpers/language-selection-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/language-selection-helpers.js
rename to features/tests/e2e/helpers/language-selection-helpers.js
diff --git a/features/tests/ui/helpers/notifications-helpers.js b/features/tests/e2e/helpers/notifications-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/notifications-helpers.js
rename to features/tests/e2e/helpers/notifications-helpers.js
diff --git a/features/tests/ui/helpers/route-helpers.js b/features/tests/e2e/helpers/route-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/route-helpers.js
rename to features/tests/e2e/helpers/route-helpers.js
diff --git a/features/tests/ui/helpers/screenshot.js b/features/tests/e2e/helpers/screenshot.js
similarity index 100%
rename from features/tests/ui/helpers/screenshot.js
rename to features/tests/e2e/helpers/screenshot.js
diff --git a/features/tests/ui/helpers/shared-helpers.js b/features/tests/e2e/helpers/shared-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/shared-helpers.js
rename to features/tests/e2e/helpers/shared-helpers.js
diff --git a/features/tests/ui/helpers/sidebar-helpers.js b/features/tests/e2e/helpers/sidebar-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/sidebar-helpers.js
rename to features/tests/e2e/helpers/sidebar-helpers.js
diff --git a/features/tests/ui/helpers/terms-of-use-helpers.js b/features/tests/e2e/helpers/terms-of-use-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/terms-of-use-helpers.js
rename to features/tests/e2e/helpers/terms-of-use-helpers.js
diff --git a/features/tests/ui/helpers/wallets-helpers.js b/features/tests/e2e/helpers/wallets-helpers.js
similarity index 100%
rename from features/tests/ui/helpers/wallets-helpers.js
rename to features/tests/e2e/helpers/wallets-helpers.js
diff --git a/features/tests/ui/setup/electron.js b/features/tests/e2e/setup/electron.js
similarity index 100%
rename from features/tests/ui/setup/electron.js
rename to features/tests/e2e/setup/electron.js
diff --git a/features/tests/ui/setup/global-types.js b/features/tests/e2e/setup/global-types.js
similarity index 100%
rename from features/tests/ui/setup/global-types.js
rename to features/tests/e2e/setup/global-types.js
diff --git a/features/tests/ui/setup/i18n.js b/features/tests/e2e/setup/i18n.js
similarity index 100%
rename from features/tests/ui/setup/i18n.js
rename to features/tests/e2e/setup/i18n.js
diff --git a/features/tests/ui/setup/webdriver.js b/features/tests/e2e/setup/webdriver.js
similarity index 100%
rename from features/tests/ui/setup/webdriver.js
rename to features/tests/e2e/setup/webdriver.js
diff --git a/features/tests/ui/steps/about-dialog.js b/features/tests/e2e/steps/about-dialog.js
similarity index 100%
rename from features/tests/ui/steps/about-dialog.js
rename to features/tests/e2e/steps/about-dialog.js
diff --git a/features/tests/ui/steps/accept-terms-of-use-steps.js b/features/tests/e2e/steps/accept-terms-of-use-steps.js
similarity index 100%
rename from features/tests/ui/steps/accept-terms-of-use-steps.js
rename to features/tests/e2e/steps/accept-terms-of-use-steps.js
diff --git a/features/tests/ui/steps/ada-redemption-steps.js b/features/tests/e2e/steps/ada-redemption-steps.js
similarity index 100%
rename from features/tests/ui/steps/ada-redemption-steps.js
rename to features/tests/e2e/steps/ada-redemption-steps.js
diff --git a/features/tests/ui/steps/app-steps.js b/features/tests/e2e/steps/app-steps.js
similarity index 100%
rename from features/tests/ui/steps/app-steps.js
rename to features/tests/e2e/steps/app-steps.js
diff --git a/features/tests/ui/steps/block-consolidation-page-steps.js b/features/tests/e2e/steps/block-consolidation-page-steps.js
similarity index 100%
rename from features/tests/ui/steps/block-consolidation-page-steps.js
rename to features/tests/e2e/steps/block-consolidation-page-steps.js
diff --git a/features/tests/ui/steps/cardano-steps.js b/features/tests/e2e/steps/cardano-steps.js
similarity index 100%
rename from features/tests/ui/steps/cardano-steps.js
rename to features/tests/e2e/steps/cardano-steps.js
diff --git a/features/tests/ui/steps/data-layer-migration.js b/features/tests/e2e/steps/data-layer-migration.js
similarity index 100%
rename from features/tests/ui/steps/data-layer-migration.js
rename to features/tests/e2e/steps/data-layer-migration.js
diff --git a/features/tests/ui/steps/general-settings-steps.js b/features/tests/e2e/steps/general-settings-steps.js
similarity index 100%
rename from features/tests/ui/steps/general-settings-steps.js
rename to features/tests/e2e/steps/general-settings-steps.js
diff --git a/features/tests/ui/steps/helper-steps.js b/features/tests/e2e/steps/helper-steps.js
similarity index 100%
rename from features/tests/ui/steps/helper-steps.js
rename to features/tests/e2e/steps/helper-steps.js
diff --git a/features/tests/ui/steps/local-time-difference-steps.js b/features/tests/e2e/steps/local-time-difference-steps.js
similarity index 100%
rename from features/tests/ui/steps/local-time-difference-steps.js
rename to features/tests/e2e/steps/local-time-difference-steps.js
diff --git a/features/tests/ui/steps/no-disk-space.js b/features/tests/e2e/steps/no-disk-space.js
similarity index 100%
rename from features/tests/ui/steps/no-disk-space.js
rename to features/tests/e2e/steps/no-disk-space.js
diff --git a/features/tests/ui/steps/node-update-notification-steps.js b/features/tests/e2e/steps/node-update-notification-steps.js
similarity index 100%
rename from features/tests/ui/steps/node-update-notification-steps.js
rename to features/tests/e2e/steps/node-update-notification-steps.js
diff --git a/features/tests/ui/steps/paper-wallets-certificate-steps.js b/features/tests/e2e/steps/paper-wallets-certificate-steps.js
similarity index 100%
rename from features/tests/ui/steps/paper-wallets-certificate-steps.js
rename to features/tests/e2e/steps/paper-wallets-certificate-steps.js
diff --git a/features/tests/ui/steps/receive-steps.js b/features/tests/e2e/steps/receive-steps.js
similarity index 100%
rename from features/tests/ui/steps/receive-steps.js
rename to features/tests/e2e/steps/receive-steps.js
diff --git a/features/tests/ui/steps/select-language-steps.js b/features/tests/e2e/steps/select-language-steps.js
similarity index 100%
rename from features/tests/ui/steps/select-language-steps.js
rename to features/tests/e2e/steps/select-language-steps.js
diff --git a/features/tests/ui/steps/settings-steps.js b/features/tests/e2e/steps/settings-steps.js
similarity index 100%
rename from features/tests/ui/steps/settings-steps.js
rename to features/tests/e2e/steps/settings-steps.js
diff --git a/features/tests/ui/steps/setup-steps.js b/features/tests/e2e/steps/setup-steps.js
similarity index 100%
rename from features/tests/ui/steps/setup-steps.js
rename to features/tests/e2e/steps/setup-steps.js
diff --git a/features/tests/ui/steps/sidebar-steps.js b/features/tests/e2e/steps/sidebar-steps.js
similarity index 100%
rename from features/tests/ui/steps/sidebar-steps.js
rename to features/tests/e2e/steps/sidebar-steps.js
diff --git a/features/tests/ui/steps/transactions-steps.js b/features/tests/e2e/steps/transactions-steps.js
similarity index 100%
rename from features/tests/ui/steps/transactions-steps.js
rename to features/tests/e2e/steps/transactions-steps.js
diff --git a/features/tests/ui/steps/trouble-connecting-notification-steps.js b/features/tests/e2e/steps/trouble-connecting-notification-steps.js
similarity index 100%
rename from features/tests/ui/steps/trouble-connecting-notification-steps.js
rename to features/tests/e2e/steps/trouble-connecting-notification-steps.js
diff --git a/features/tests/ui/steps/trouble-syncing-notification-steps.js b/features/tests/e2e/steps/trouble-syncing-notification-steps.js
similarity index 100%
rename from features/tests/ui/steps/trouble-syncing-notification-steps.js
rename to features/tests/e2e/steps/trouble-syncing-notification-steps.js
diff --git a/features/tests/ui/steps/wallets-limit.js b/features/tests/e2e/steps/wallets-limit.js
similarity index 100%
rename from features/tests/ui/steps/wallets-limit.js
rename to features/tests/e2e/steps/wallets-limit.js
diff --git a/features/tests/ui/steps/wallets-steps.js b/features/tests/e2e/steps/wallets-steps.js
similarity index 100%
rename from features/tests/ui/steps/wallets-steps.js
rename to features/tests/e2e/steps/wallets-steps.js
diff --git a/features/toggle-sidebar-submenus.feature b/features/toggle-sidebar-submenus.feature
index 5e5e4474dc..661516bfe8 100644
--- a/features/toggle-sidebar-submenus.feature
+++ b/features/toggle-sidebar-submenus.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Toggle Sidebar Submenus
 
   Background:
diff --git a/features/transactions-display.feature b/features/transactions-display.feature
index f3e1e855ed..3637196652 100644
--- a/features/transactions-display.feature
+++ b/features/transactions-display.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Display wallet transactions
 
   The wallet summary screen displays the five most recent transactions,
diff --git a/features/trouble-connecting-notification.feature b/features/trouble-connecting-notification.feature
index 7967fba299..f8101eb8dc 100644
--- a/features/trouble-connecting-notification.feature
+++ b/features/trouble-connecting-notification.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Trouble Connecting Notification
 
   Background:
diff --git a/features/trouble-syncing-notification.feature b/features/trouble-syncing-notification.feature
index 3232ef7ddd..5af0ae2d5f 100644
--- a/features/trouble-syncing-notification.feature
+++ b/features/trouble-syncing-notification.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Trouble Syncing Notification
 
   Background:
diff --git a/features/wallet-address-generate.feature b/features/wallet-address-generate.feature
index 76d70787ac..e40a59010d 100644
--- a/features/wallet-address-generate.feature
+++ b/features/wallet-address-generate.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Generate Wallet Address
 
   Background:
diff --git a/features/wallet-settings.feature b/features/wallet-settings.feature
index a5b578ae1b..965247d8be 100644
--- a/features/wallet-settings.feature
+++ b/features/wallet-settings.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Wallet Settings
 
   Background:
diff --git a/features/wallets-limit.feature b/features/wallets-limit.feature
index ba5b1ab2f6..641c565430 100644
--- a/features/wallets-limit.feature
+++ b/features/wallets-limit.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Wallet Settings
 
   Background:
diff --git a/features/wallets-ordering.feature b/features/wallets-ordering.feature
index e4fcf58d18..f9d606e3c8 100644
--- a/features/wallets-ordering.feature
+++ b/features/wallets-ordering.feature
@@ -1,4 +1,4 @@
-@ui
+@e2e
 Feature: Wallet Odering
 
   Background:
diff --git a/gulpfile.js b/gulpfile.js
index 8c63001ade..29f38b6d6a 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -125,13 +125,13 @@ gulp.task(
 );
 
 gulp.task(
-  'test:ui:nodemon',
+  'test:e2e:nodemon',
   shell.task(
-    'nodemon --watch dist --watch features --exec "yarn test:ui --tags \'@ui and @watch\'"'
+    'nodemon --watch dist --watch features --exec "yarn test:e2e --tags \'@e2e and @watch\'"'
   )
 );
 
-gulp.task('test:ui:watch', gulp.series('build:watch', 'test:ui:nodemon'));
+gulp.task('test:e2e:watch', gulp.series('build:watch', 'test:e2e:nodemon'));
 
 gulp.task(
   'purge:translations',
diff --git a/package.json b/package.json
index e779e895ff..47ffc1b3f2 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,12 @@
     "start": "gulp start",
     "start:dev": "NODE_ENV=development gulp start",
     "dev": "IS_WATCH_MODE=true gulp dev",
-    "test": "NODE_ENV=test yarn build && yarn test:unit && yarn test:ui",
+    "test": "NODE_ENV=test yarn build && yarn test:unit && yarn test:e2e",
     "test:unit": "yarn cucumber --require 'features/tests/unit/**/*.js' --tags '@unit and not @skip'",
     "test:unit:watch": "nodemon --watch source --watch features --exec \"yarn test:unit --tags '@unit and @watch'\"",
     "test:unit:unbound": "yarn cucumber --require 'features/tests/unit/**/*.js' --tags '@unbound and not @skip'",
-    "test:ui": "yarn cucumber --require 'features/tests/ui/**/*.js' --tags '@ui and not @skip'",
-    "test:ui:watch": "gulp test:ui:watch",
+    "test:e2e": "yarn cucumber --require 'features/tests/e2e/**/*.js' --tags '@e2e and not @skip'",
+    "test:e2e:watch": "gulp test:e2e:watch",
     "cucumber": "cross-env NODE_ENV=test cucumber-js --require-module @babel/register -f node_modules/cucumber-pretty --format-options '{\"snippetInterface\": \"async-await\"}'",
     "debug": "gulp debug",
     "package": "gulp build && cross-env NODE_ENV=production node -r @babel/register -r @babel/polyfill scripts/package.js",