diff --git a/wdio/features/Accounts/AccountActions.feature b/wdio/features/Accounts/AccountActions.feature
index 6127690e5d8..acb758d731c 100644
--- a/wdio/features/Accounts/AccountActions.feature
+++ b/wdio/features/Accounts/AccountActions.feature
@@ -1,3 +1,6 @@
+@androidApp
+@regression
+@accounts
 Feature: Displaying account actions
 
   Scenario: Show private key screen
diff --git a/wdio/features/Accounts/CreatingWalletAccount.feature b/wdio/features/Accounts/CreatingWalletAccount.feature
index bd4f5d2d4be..586d2e966c7 100644
--- a/wdio/features/Accounts/CreatingWalletAccount.feature
+++ b/wdio/features/Accounts/CreatingWalletAccount.feature
@@ -1,5 +1,6 @@
 @androidApp
 @smoke
+@accounts
 Feature: Create Account
 
   Scenario: Import wallet
diff --git a/wdio/features/Accounts/ImportingAccount.feature b/wdio/features/Accounts/ImportingAccount.feature
index 6799eaafb1d..6684f63f88b 100644
--- a/wdio/features/Accounts/ImportingAccount.feature
+++ b/wdio/features/Accounts/ImportingAccount.feature
@@ -1,5 +1,6 @@
 @androidApp
 @regression
+@accounts
 Feature: Import Aaccount
 
   Scenario: Import Wallet
diff --git a/wdio/features/BrowserFlow/AddFavorite.feature b/wdio/features/BrowserFlow/AddFavorite.feature
index 448cff33c93..5c75fcf6e29 100644
--- a/wdio/features/BrowserFlow/AddFavorite.feature
+++ b/wdio/features/BrowserFlow/AddFavorite.feature
@@ -1,5 +1,6 @@
 @androidApp 
 @smoke
+@browser
 Feature: Browser Add Favorite
 
   Scenario: Adding browser Favorites
diff --git a/wdio/features/BrowserFlow/AddressBar.feature b/wdio/features/BrowserFlow/AddressBar.feature
index e425ff4510e..33a0b4cfcfc 100644
--- a/wdio/features/BrowserFlow/AddressBar.feature
+++ b/wdio/features/BrowserFlow/AddressBar.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: This feature file covers address view functionality in the browser.
+@browser
+Feature: Browser Address Bar
 
   Scenario: Address bar
   Navigate to websites using browser address bar.
diff --git a/wdio/features/BrowserFlow/ENSWebsite.feature b/wdio/features/BrowserFlow/ENSWebsite.feature
index a99af060a89..43e81b3ec37 100644
--- a/wdio/features/BrowserFlow/ENSWebsite.feature
+++ b/wdio/features/BrowserFlow/ENSWebsite.feature
@@ -1,6 +1,7 @@
 @androidApp 
 @regression
-Feature: This feature file covers ENS website in browser.
+@browser
+Feature: Browser ENS Website
 
   Scenario: ENS website loads correctly
   Navigate to ENS website using browser address bar.
diff --git a/wdio/features/BrowserFlow/InvalidURL.feature b/wdio/features/BrowserFlow/InvalidURL.feature
index 4f65eb616c7..37da6977cac 100644
--- a/wdio/features/BrowserFlow/InvalidURL.feature
+++ b/wdio/features/BrowserFlow/InvalidURL.feature
@@ -1,5 +1,6 @@
 @androidApp 
 @smoke
+@browser
 Feature: Browser Invalid URL
 
   Scenario: Searching an invalid url and prompts the user with an error message
diff --git a/wdio/features/BrowserFlow/NavigationControls.feature b/wdio/features/BrowserFlow/NavigationControls.feature
index b60c0636018..7fad34c8939 100644
--- a/wdio/features/BrowserFlow/NavigationControls.feature
+++ b/wdio/features/BrowserFlow/NavigationControls.feature
@@ -1,6 +1,7 @@
 @androidApp 
 @regression
-Feature: This feature file covers all the navigation control options in browser.
+@browser
+Feature: Browser Control Options
 
   Scenario: Navigation with browser controls
   Use the browser controls at the bottom of the view to go back,
diff --git a/wdio/features/BrowserFlow/OptionMenu.feature b/wdio/features/BrowserFlow/OptionMenu.feature
index 1e8e38de7cf..48fce53c938 100644
--- a/wdio/features/BrowserFlow/OptionMenu.feature
+++ b/wdio/features/BrowserFlow/OptionMenu.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: This feature file covers the option menu in the browser.
+@browser
+Feature: Browser Options Menu
 
   Scenario: Import wallet
     Given the app displayed the splash animation
diff --git a/wdio/features/BrowserFlow/PhishingDetection.feature b/wdio/features/BrowserFlow/PhishingDetection.feature
index 9aedc84400e..7da30ddae9d 100644
--- a/wdio/features/BrowserFlow/PhishingDetection.feature
+++ b/wdio/features/BrowserFlow/PhishingDetection.feature
@@ -1,5 +1,6 @@
 @androidApp 
 @smoke
+@browser
 Feature: Browser Phishing Detection
 
   Scenario: Visiting a malicious website prompts the user with the phishing detection warning
diff --git a/wdio/features/BrowserFlow/RemovingImportedAccountAfterConnectingToDapp.feature b/wdio/features/BrowserFlow/RemovingImportedAccountAfterConnectingToDapp.feature
index 1c342c46633..6a19e562648 100644
--- a/wdio/features/BrowserFlow/RemovingImportedAccountAfterConnectingToDapp.feature
+++ b/wdio/features/BrowserFlow/RemovingImportedAccountAfterConnectingToDapp.feature
@@ -1,7 +1,7 @@
 @androidApp
 @smoke
-
-Feature: Importing account via private then revoking permissions
+@browser
+Feature: Browser Import, Revoke, Remove Account
 
   Scenario: Import wallet
     Given the app displayed the splash animation
diff --git a/wdio/features/BrowserFlow/RevokingSingleAccount.feature b/wdio/features/BrowserFlow/RevokingSingleAccount.feature
index 3db0e9163ad..5de88b11f77 100644
--- a/wdio/features/BrowserFlow/RevokingSingleAccount.feature
+++ b/wdio/features/BrowserFlow/RevokingSingleAccount.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: Revoking access to a dapp while connected to one account.
+@browser
+Feature: Browser Revoke Account dApp Permissions
 
     Scenario: Import wallet
         Given the app displayed the splash animation
diff --git a/wdio/features/Networks/NetworkFlow.feature b/wdio/features/Networks/NetworkFlow.feature
index 351646c4706..50c11111f28 100644
--- a/wdio/features/Networks/NetworkFlow.feature
+++ b/wdio/features/Networks/NetworkFlow.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: Adding Networks via the popular and custom networks flow
+@networks
+Feature: Add Networks
 User should be able to add a custom network via the popular network flow
 User should also have the ability to a add custom network via the custom network flow.
 
diff --git a/wdio/features/Onboarding/CreateNewWallet.feature b/wdio/features/Onboarding/CreateNewWallet.feature
index 32c2761caeb..1b77f03f366 100644
--- a/wdio/features/Onboarding/CreateNewWallet.feature
+++ b/wdio/features/Onboarding/CreateNewWallet.feature
@@ -1,6 +1,7 @@
 @androidApp
-@regression
-Feature: Create New Wallet
+@smoke
+@onboarding
+Feature: Onboarding Create New Wallet
 
   Scenario: Onboarding New walllet
     User opens the app for first time and creates a new wallet.
diff --git a/wdio/features/Onboarding/ImportWallet.feature b/wdio/features/Onboarding/ImportWallet.feature
index 7e45e487685..8651edf4426 100644
--- a/wdio/features/Onboarding/ImportWallet.feature
+++ b/wdio/features/Onboarding/ImportWallet.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: Import Wallet
+@onboarding
+Feature: Onboarding Import Wallet
   Users can use the app to import an existing wallet or create a new one.
 
   Scenario: Get Started
@@ -9,11 +10,11 @@ Feature: Import Wallet
     Then Wallet setup screen is displayed
     When I tap "Import using Secret Recovery Phrase"
     Then "Help us improve MetaMask" is displayed
-    When I tap "I agree"
-    And Terms of Use is displayed
-    And I agree to terms
-    And Terms of Use is not displayed
-    Then "Import from seed" is displayed
+    And On Wallet Setup Screen I tap "Agree"
+    Then Terms of Use is displayed
+    When I agree to terms
+    Then Terms of Use is not displayed
+    And "Import from seed" is displayed
 
   Scenario Outline: Password Strength
     When I type <password> in new password field
@@ -36,7 +37,6 @@ Feature: Import Wallet
     And I tap "Import"
     Then device alert <error> is displayed
     And I tap Yes on alert
-
     Examples:
       | invalid_SRP                                                              | error                                                       |
       | fold media south not valid secret recovery phrase pause cloth just raven | Invalid Secret Recovery Phrase                              |
diff --git a/wdio/features/Onboarding/OnboardingCarousel.feature b/wdio/features/Onboarding/OnboardingCarousel.feature
index 59f9cf6879b..1eacf49a457 100644
--- a/wdio/features/Onboarding/OnboardingCarousel.feature
+++ b/wdio/features/Onboarding/OnboardingCarousel.feature
@@ -1,5 +1,6 @@
 @androidApp
 @smoke
+@onboarding
 Feature: Onboarding Carousel
   Users can install MetaMask mobile app from the device app store and read the onboarding carousel
 
diff --git a/wdio/features/Onboarding/TermsOfUse.feature b/wdio/features/Onboarding/TermsOfUse.feature
index 17f083d454f..270b62e1583 100644
--- a/wdio/features/Onboarding/TermsOfUse.feature
+++ b/wdio/features/Onboarding/TermsOfUse.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: Terms of Use
+@onboarding
+Feature: Onboarding Terms of Use
 
   Scenario: Install and launch app
     Given the app displayed the splash animation
diff --git a/wdio/features/Performance/AppLaunchTime.feature b/wdio/features/Performance/AppLaunchTime.feature
index 2880daba031..c4cf7f6a263 100644
--- a/wdio/features/Performance/AppLaunchTime.feature
+++ b/wdio/features/Performance/AppLaunchTime.feature
@@ -1,6 +1,6 @@
 @androidApp 
 @performance
-Feature: App Cold Start launch times.
+Feature: App Cold Start Launch Times
   This feature measures the cold start of the app when:
   The user installs the app for the very first time
   The user imports a wallet
diff --git a/wdio/features/SecurityAndPrivacy/DeleteWallet.feature b/wdio/features/SecurityAndPrivacy/DeleteWallet.feature
index 88b039b94cf..412bb4c9bc7 100644
--- a/wdio/features/SecurityAndPrivacy/DeleteWallet.feature
+++ b/wdio/features/SecurityAndPrivacy/DeleteWallet.feature
@@ -1,5 +1,7 @@
-@androidApp @regression
-Feature: This feature deletes the wallet from the Security and Privacy View
+@androidApp 
+@regression
+@security-privacy
+Feature: Security & Privacy Delete Wallet
 
   Background: Import wallet
     Given the app displayed the splash animation
@@ -13,7 +15,7 @@ Feature: This feature deletes the wallet from the Security and Privacy View
     And I tap on "Settings" in the menu
     And In settings I tap on "Security & Privacy"
     Then Security & Privacy screen is displayed
-    And I tap on the Delete Wallet button
+    When I tap on the Delete Wallet button
     And I tap I understand, continue on Delete wallet modal
     And I type "delete" on Delete wallet modal permanently
     And I tap Delete my wallet on Delete wallet modal permanently
diff --git a/wdio/features/SecurityAndPrivacy/RememberMe.feature b/wdio/features/SecurityAndPrivacy/RememberMe.feature
index 159d22ec71c..6fcb07bd1c5 100644
--- a/wdio/features/SecurityAndPrivacy/RememberMe.feature
+++ b/wdio/features/SecurityAndPrivacy/RememberMe.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: A user enables remember me and is no longer prompted with password authentication
+@security-privacy
+Feature: Security & Privacy Remember Me
 
   Scenario: Enabling remember me and verifying that the app does not require password authentication after remember me is enabled.
     Given the app displayed the splash animation
diff --git a/wdio/features/Settings/ChangePassword.feature b/wdio/features/Settings/ChangePassword.feature
index 5771f9dcf87..7f6c0ef0b8f 100644
--- a/wdio/features/Settings/ChangePassword.feature
+++ b/wdio/features/Settings/ChangePassword.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: Change password
+@settings
+Feature: Settings Change Password
 
   Scenario: Import wallet
     Given the app displayed the splash animation
diff --git a/wdio/features/Wallet/AddressFlow.feature b/wdio/features/Wallet/AddressFlow.feature
index 245e15002ba..c0b52399d94 100644
--- a/wdio/features/Wallet/AddressFlow.feature
+++ b/wdio/features/Wallet/AddressFlow.feature
@@ -1,6 +1,7 @@
 @androidApp
 @regression
-Feature: Adding addresses to contacts via address book modal and the contacts screen
+@wallet
+Feature: Add Contacts
   User should see the correct warning when trying to send funds to a contract address
   User can saved an ENS name to your address book
   The contacts you saved on network A does not carry over to network B
diff --git a/wdio/features/Wallet/ExploringWizard.feature b/wdio/features/Wallet/ExploringWizard.feature
index db064c12ce9..efe78a0add5 100644
--- a/wdio/features/Wallet/ExploringWizard.feature
+++ b/wdio/features/Wallet/ExploringWizard.feature
@@ -1,5 +1,6 @@
 @androidApp
 @regression
+@wallet
 Feature: Exploring wizard
 
   Scenario: A user should be able to go through the start exploring tutorial
diff --git a/wdio/features/Wallet/ImportCustomToken.feature b/wdio/features/Wallet/ImportCustomToken.feature
index 18408955cca..517f3f39891 100644
--- a/wdio/features/Wallet/ImportCustomToken.feature
+++ b/wdio/features/Wallet/ImportCustomToken.feature
@@ -1,5 +1,6 @@
 @androidApp
 @smoke
+@wallet
 Feature: Import Custom Token
 
   Scenario: Import wallet
diff --git a/wdio/features/Wallet/LockResetWallet.feature b/wdio/features/Wallet/LockResetWallet.feature
index 9c8d2861a8a..592a946f89a 100644
--- a/wdio/features/Wallet/LockResetWallet.feature
+++ b/wdio/features/Wallet/LockResetWallet.feature
@@ -1,5 +1,6 @@
 @androidApp
 @smoke
+@wallet
 Feature: Lock and Reset Wallet
 
   Scenario: Import account
diff --git a/wdio/features/Wallet/RequestTokenFlow.feature b/wdio/features/Wallet/RequestTokenFlow.feature
index 2280bd80ed5..ba720fe4dec 100644
--- a/wdio/features/Wallet/RequestTokenFlow.feature
+++ b/wdio/features/Wallet/RequestTokenFlow.feature
@@ -1,5 +1,6 @@
 @androidApp
 @regression
+@wallet
 Feature: Request Token
 This feature goes through the request token flow
 
diff --git a/wdio/features/Wallet/SendToken.feature b/wdio/features/Wallet/SendToken.feature
index ed46deb49b6..e1c172a18dd 100644
--- a/wdio/features/Wallet/SendToken.feature
+++ b/wdio/features/Wallet/SendToken.feature
@@ -1,5 +1,6 @@
 @androidApp
 @regression
+@wallet
 Feature: Sending Native and ERC Tokens
 
   Scenario: Import wallet