Repository: mozilla-mobile/firefox-ios
Pull request #25662: MTE-4460 Bitrise Test Sharding
Author: login: isabelrios
Created: 2025-03-31T12:57:11Z | Merged: 2025-04-24T07:42:17Z

## :scroll: Tickets
[Jira ticket](https://mozilla-hub.atlassian.net/browse/MTE-4460)

By using Test Sharding, we can have just one test plan for UI tests and those will be split into 5 shards (or the ones we specify) to run in parallel.
That simplifies our tests plans and bitrise.yml file considerably. Additionally, adding more tests is much easier as well as to split them so that the test execution time does not increase as the coverage is higher

https://docs.google.com/document/d/1aQzbF10_GQviDv73-8KIXIvEt5hnECnUcw0XgH72wzQ/edit?tab=t.0



Diff:
diff --git a/bitrise.yml b/bitrise.yml
index ce79c0bd8a608..2090f83285210 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -3,36 +3,26 @@ default_step_lib_source: 'https://github.com/bitrise-io/bitrise-steplib.git'
 project_type: ios
 pipelines:
   pipeline_build_and_test:
-    stages:
-    - pre_configuration: {}
-    - build_applications: {}
-    - run_tests: {}
-stages:
-  pre_configuration:
     workflows:
-    - determine_apps_affected: {}
-  build_applications:
-    workflows:
-    - firefox_configure_build:
-        run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
-    - focus_configure_build:
-        run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
-  run_tests:
-    workflows:
-    - build_and_test_1_SmokeTest1:
-        run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
-    - build_and_test_2_SmokeTest2:
-        run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
-    - build_and_test_3_SmokeTest3:
-        run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
-    - build_and_test_4_SmokeTest4:
-        run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
-    - focus_ui_test:
-        run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
-    - focus_unit_test:
-        run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
-    - klar_unit_test:
-        run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
+        determine_apps_affected: {}
+        firefox_configure_build:
+            depends_on:
+            - determine_apps_affected
+        focus_configure_build:
+            depends_on:
+            - determine_apps_affected
+        klar_configure_build:
+            depends_on:
+            - determine_apps_affected
+        run_firefox_ui_tests:
+            depends_on:
+            - firefox_configure_build
+            parallel: 5
+        focus_ui_test:
+            depends_on:
+            - focus_configure_build
+            parallel: 1
+
 workflows:
   firefox_accessibility_test:
     before_run:
@@ -122,6 +112,7 @@ workflows:
             Mana|https://mana.mozilla.org/wiki/display/MTE/Mobile+Test+Engineering
 
   firefox_configure_build:
+    run_if: '{{getenv "BUILD_FIREFOX_IOS" | eq "true"}}'
     before_run:
     - 0_detect_standalone_build
     - 1_git_clone_and_post_clone
@@ -133,61 +124,58 @@ workflows:
         run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
     - restore-spm-cache@2.1.1:
         is_always_run: true
+    - xcode-build-for-test@3:
+        inputs:
+        - scheme: Fennec
+        - configuration: Fennec_Testing
+        - project_path: /Users/vagrant/git/firefox-ios/Client.xcodeproj
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
     - script@1.2.1:
-        title: Build for Testing
+        title: Override xctestrun file to UnitTests
         inputs:
-        - content: |
+        - content: |-
+            #!/usr/bin/env bash
             set -euxo pipefail
-            echo "-- build-for-testing --"
-            mkdir DerivedData
 
-            xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile
-            xcodebuild "-project" "/Users/vagrant/git/firefox-ios/Client.xcodeproj" "-scheme" "Fennec" -configuration "Fennec_Testing" "CODE_SIGNING_ALLOWED=NO" -sdk "iphonesimulator" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_fennec.log
+            # Point to the Unit tests plan instead of Accessibility
+            UNIT_TESTS_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun"
+            SMOKE_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator18.2-arm64.xctestrun"
+
+            if [ ! -f "$UNIT_TESTS_XCTESTRUN" ]; then
+              echo "ERROR: .xctestrun file not found: $UNIT_TESTS_XCTESTRUN"
+              exit 1
+            fi
+
+            echo "Found UnitTest .xctestrun: $UNIT_TESTS_XCTESTRUN"
+            envman add --key BITRISE_XCTESTRUN_UNIT_TEST_FILE_PATH --value "$UNIT_TESTS_XCTESTRUN"
+            envman add --key BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH --value "$SMOKE_UI_XCTESTRUN"
 
-            ls /Users/vagrant/git/DerivedData/Build/Products
-            ls /Users/vagrant/git/DerivedData
     - xcode-test-without-building@0.4.0:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
         timeout: 1200
         inputs:
         - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
         - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
-        - xctestrun: "/Users/vagrant/git/DerivedData/Build/Products/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun"
+        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun
         - maximum_test_repetitions: 2
-    - save-spm-cache@1.3.1:
+    - xcode-test-shard-calculation@0:
+        inputs:
+        - product_path: $BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH
+        - shard_count: 5
+        - destination: $BITRISE_DESTINATION
+        outputs:
+        - BITRISE_TEST_SHARDS_PATH: BITRISE_TEST_SHARDS_PATH_FIREFOX 
         is_always_run: true
-    - script@1.2.1:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
-        title: Compress Derived Data
+    - save-spm-cache@1.3.1:
         is_always_run: true
-        inputs:
-        - content: |
-            set -euxo pipefail
-            ls /Users/vagrant/git/DerivedData
-            ls /Users/vagrant/git/DerivedData/Build/Products
-
-            echo "-- compress --"
-            # Add Fennec-iphonesimulator folder
-            # Add All .xctestrun files
-            # Add firefox-ios-test files and test plans
-
-            exec zip -0 -qr "${BITRISE_SOURCE_DIR}/DerivedData.zip" \
-            "$BITRISE_SOURCE_DIR/DerivedData/Build/Products/" \
-            "$BITRISE_SOURCE_DIR/DerivedData/Build/Products/Fennec-iphonesimulator/" \
-            "$BITRISE_SOURCE_DIR/firefox-ios/Client.xcodeproj" \
-            "$BITRISE_SOURCE_DIR/firefox-ios/firefox-ios-tests/" \
-            "$BITRISE_SOURCE_DIR/firefox-ios/Client/" \
-            "$BITRISE_SOURCE_DIR/xcodebuild.log"
     - deploy-to-bitrise-io@2.10.0:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests" | and (getenv "BITRISE_XCRESULT_PATH" | ne "")}}'
         inputs:
-        - deploy_path: "${BITRISE_SOURCE_DIR}/DerivedData.zip"
         - pipeline_intermediate_files: |-
-            $BITRISE_XCRESULT_PATH:BITRISE_XCRESULT_PATH
-            ${BITRISE_SOURCE_DIR}/DerivedData.zip:DERIVED_DATA_DIR
+            BITRISE_TEST_SHARDS_PATH_FIREFOX
+            BITRISE_TEST_BUNDLE_PATH
+            BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH
         is_always_run: true
     - script@1.1.1:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
         title: Run Danger 2
         timeout: 360
         inputs:
@@ -249,56 +237,24 @@ workflows:
         - text: Build status using latest Rust-Component
         - webhook_url: $WEBHOOK_SLACK_TOKEN_2
 
-  build_and_test_1_SmokeTest1:
-    envs:
-    - opts:
-        is_expand: false
-      SHARD: '1'
-    after_run:
-    - _build_and_test
-
-  build_and_test_2_SmokeTest2:
-    envs:
-    - opts:
-        is_expand: false
-      SHARD: '2'
-    after_run:
-    - _build_and_test
-
-  build_and_test_3_SmokeTest3:
-    envs:
-    - opts:
-        is_expand: false
-      SHARD: '3'
-    after_run:
-    - _build_and_test
-
-  build_and_test_4_SmokeTest4:
-    envs:
-    - opts:
-        is_expand: false
-      SHARD: '4'
-    after_run:
-    - _build_and_test
-
-  _build_and_test:
+  run_firefox_ui_tests:
+    run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
     before_run:
-    - 0_detect_standalone_build
     - 1_git_clone_and_post_clone
-    - decision_to_run_UI_Tests
-    - firefox_pull_and_unzip_dependencies
     steps:
-    - xcode-test-without-building@0.4.0:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
+    - pull-intermediate-files@1: {}
+    - xcode-test-without-building@0.4.2:
         timeout: 1200
         inputs:
+        - only_testing: $BITRISE_TEST_SHARDS_PATH_FIREFOX/$BITRISE_IO_PARALLEL_INDEX
         - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
-        - xcodebuild_options: '"-derivedDataPath" "/Users/vagrant/git/DerivedData" "COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
-        - xctestrun: "Users/vagrant/git/DerivedData/Build/Products/Fennec_Smoketest${SHARD}_iphonesimulator18.2-arm64.xctestrun"
-    - deploy-to-bitrise-io@2.10.0:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
-        inputs:
-        - pipeline_intermediate_files: '$BITRISE_XCRESULT_PATH:BITRISE_UITESTS_${SHARD}_XCRESULT_PATH'
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator18.2-arm64.xctestrun
+    - deploy-to-bitrise-io@2.10.0: {}
+    meta:
+      bitrise.io:
+        stack: osx-xcode-16.2.x
+        machine_type_id: g2.mac.4x-large
   determine_apps_affected:
     steps:
     - git-clone@6.2: {}
@@ -429,26 +385,6 @@ workflows:
             echo "BUILD_FOCUS_IOS: $BUILD_FOCUS_IOS"
             echo "BUILD_SAMPLE_BROWSER_IOS: $BUILD_SAMPLE_BROWSER_IOS"
 
-  firefox_pull_and_unzip_dependencies:
-    steps:
-    - pull-intermediate-files@1.2.1:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
-        inputs:
-        - verbose: true
-        - artifact_sources: build_applications.firefox_configure_build
-    - script@1.2.1:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
-        title: Unzip
-        inputs:
-        - content: |
-            set -euxo pipefail
-            echo "$DERIVED_DATA_DIR"
-
-            echo "-- unzip -- "
-            exec unzip "$DERIVED_DATA_DIR"
-
-            echo "show dir"
-            ls
   send_slack_notification:
     steps:
     - slack@4.2.1:
@@ -1747,6 +1683,7 @@ workflows:
   # *****%*****%***** FOCUS WORKFLOWS *****%*****%*****
   # 
   focus_configure_build:
+    run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
     before_run:
     - focus-clone-and-build-dependencies
     steps:
@@ -1760,57 +1697,86 @@ workflows:
         - content: |-
             #!/usr/bin/env bash
             set -x
-            /usr/libexec/PlistBuddy -c "Add :com.apple.developer.web-browser bool true" Focus.entitlements
             /usr/libexec/PlistBuddy -c "Add :com.apple.developer.web-browser bool true" Klar.entitlements
-    - script@1.2.1:
-        title: Build for Testing Focus
+    - xcode-build-for-test@3:
         inputs:
-        - content: |
-            set -euxo pipefail
-            echo "-- build-for-testing --"
-            mkdir DerivedData
-            #xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile
-            xcodebuild "-project" "/Users/vagrant/git/focus-ios/Blockzilla.xcodeproj" "-scheme" "Focus" -configuration "FocusDebug" "CODE_SIGNING_ALLOWED=NO" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_test.log
+        - scheme: Focus
+        - configuration: FocusDebug
+        - project_path: /Users/vagrant/git/focus-ios/Blockzilla.xcodeproj
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
     - script@1.2.1:
-        title: Build for Testing Klar
+        title: Override xctestrun Focus env variables
         inputs:
-        - content: |
+        - content: |-
+            #!/usr/bin/env bash
             set -euxo pipefail
-            echo "-- build-for-testing --"
-            xcodebuild "-project" "/Users/vagrant/git/focus-ios/Blockzilla.xcodeproj" "-scheme" "Klar" -configuration "KlarDebug" "CODE_SIGNING_ALLOWED=NO" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_test.log
-    - script@1.2.1:
-        title: Compress Derived Data
-        is_always_run: true
+            # Point to the Unit tests plan instead of Accessibility
+            FOCUS_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Focus_SmokeTest_iphonesimulator18.2-arm64.xctestrun"
+
+            echo "Found UITest .xctestrun: $FOCUS_UI_XCTESTRUN"
+            envman add --key BITRISE_XCTESTRUN_FOCUS_UI_TEST_FILE_PATH --value "$FOCUS_UI_XCTESTRUN"
+    - xcode-test-without-building@0.4.2:
+        timeout: 1200
         inputs:
-        - content: |
-            set -euxo pipefail
-            echo "-- compress --"
-            # Add FocusDebug-iphonesimulator folder
-            # Add All .xctestrun files
-            # Add focuos-ios-test files and test plans
-            # Add KlarDebug-iphonesimulator folder
-            exec zip -0 -qr "${BITRISE_SOURCE_DIR}/DerivedData.zip" \
-            "${BITRISE_SOURCE_DIR}/focus-ios/Blockzilla.xcodeproj" \
-            "$BITRISE_SOURCE_DIR/DerivedData/Build/Products/FocusDebug-iphonesimulator/" \
-            "$BITRISE_SOURCE_DIR/DerivedData/Build/Products/KlarDebug-iphonesimulator/" \
-            "$BITRISE_SOURCE_DIR/DerivedData/Build/Products/" \
-            "$BITRISE_SOURCE_DIR/focus-ios/focus-ios-tests/" \
-            "$BITRISE_SOURCE_DIR/focus-ios/xcodebuild.log" \
-            "$BITRISE_SOURCE_DIR/focus-ios/Blockzilla/"
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Focus_UnitTests_iphonesimulator18.2-arm64.xctestrun
+    - xcode-test-shard-calculation@0:
+        inputs:
+        - product_path: $BITRISE_XCTESTRUN_FOCUS_UI_TEST_FILE_PATH
+        - shard_count: 1
+        - destination: $BITRISE_DESTINATION
     - deploy-to-bitrise-io@2.10.0:
         inputs:
-        - deploy_path: "${BITRISE_SOURCE_DIR}/DerivedData.zip"
         - pipeline_intermediate_files: |-
-            ${BITRISE_SOURCE_DIR}/DerivedData.zip:DERIVED_DATA_DIR
+            BITRISE_TEST_BUNDLE_PATH
+            BITRISE_TEST_SHARDS_PATH
+            BITRISE_XCTESTRUN_FOCUS_UI_TEST_FILE_PATH
     - slack@4.2.1:
         run_if: ".IsBuildFailed"
         inputs:
         - channel: "#mobile-alerts-ios"
         - message: "The build failed to build"
         - webhook_url: "$SLACK_WEBHOOK"
-  focus_ui_test:
+
+  klar_configure_build:
+    run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
     before_run:
-    - focus-pull-and-unzip-dependencies
+    - focus-clone-and-build-dependencies
+    steps:
+    - cache-pull@2.7.2: {}
+    #- swiftlint-extended@1:
+    #    inputs:
+    #    - linting_path: "$BITRISE_SOURCE_DIR"
+    - script@1.2.1:
+        title: Set Default Web Browser Entitlement
+        inputs:
+        - content: |-
+            #!/usr/bin/env bash
+            set -x
+            /usr/libexec/PlistBuddy -c "Add :com.apple.developer.web-browser bool true" Klar.entitlements  
+    - xcode-build-for-test@3:
+        inputs:
+        - scheme: Klar
+        - configuration: KlarDebug
+        - project_path: /Users/vagrant/git/focus-ios/Blockzilla.xcodeproj
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
+    - xcode-test-without-building@0.4.2:
+        timeout: 1200
+        inputs:
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Klar_UnitTests_iphonesimulator18.2-arm64.xctestrun
+    - deploy-to-bitrise-io@2.10.0: {}
+    - slack@4.2.1:
+        run_if: ".IsBuildFailed"
+        inputs:
+        - channel: "#mobile-alerts-ios"
+        - message: "The build run the Klar testPlan: UnitTests"
+        - webhook_url: "$SLACK_WEBHOOK"
+  focus_ui_test:
     steps:
     - script@1.2.1:
         inputs:
@@ -1832,23 +1798,14 @@ workflows:
                 envman add --key TEST_PLAN_NAME --value SmokeTest
             fi
         - title: Check if build is scheduled or regular to set the test plan
-    - script@1.2.1:
-        title: Test without Building
+    - pull-intermediate-files@1: {}
+    - xcode-test-without-building@0.4.2:
+        timeout: 1200
         inputs:
-        - content: |
-            #!/usr/bin/env bash
-            set -ex
-            ls ./Users/vagrant/git/focus-ios/focus-ios-tests/XCUITest/
-            ls ./Users/vagrant/git/DerivedData/Build/Products
-            cp -r ./Users/vagrant/git/focus-ios/focus-ios-tests/XCUITest/* .
-            mv ./Users/vagrant/git/* .
-            ls -la
-            echo "-- test-without-building --"
-            xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Focus_SmokeTest_iphonesimulator18.2-arm64.xctestrun"
-    - custom-test-results-export@1.0.0:
-        inputs:
-        - search_pattern: "$BITRISE_SOURCE_DIR/xcodebuild.xcresult"
-        - test_name: SmokeTest
+        - only_testing: $BITRISE_TEST_SHARDS_PATH/$BITRISE_IO_PARALLEL_INDEX
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Focus_SmokeTest_iphonesimulator18.2-arm64.xctestrun
     - deploy-to-bitrise-io@2.10.0: {}
     - github-status@3.0.1:
         inputs:
@@ -1859,61 +1816,6 @@ workflows:
         - channel: "#mobile-alerts-ios"
         - message: "The build run the Focus testPlan: $TEST_PLAN_NAME"
         - webhook_url: "$SLACK_WEBHOOK"
-  klar_unit_test:
-    before_run:
-    - focus-pull-and-unzip-dependencies
-    steps:
-    - script@1.2.1:
-        title: Test without Building
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-            set -ex
-            ls ./Users/vagrant/git/focus-ios/Blockzilla.xcodeproj/
-            cp -r ./Users/vagrant/git/focus-ios/Blockzilla.xcodeproj/* .
-            mv ./Users/vagrant/git/* .
-            ls -la
-            echo "-- test-without-building --"
-            xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Klar_UnitTests_iphonesimulator18.2-arm64.xctestrun"
-    - custom-test-results-export@1.0.0:
-        inputs:
-        - search_pattern: "$BITRISE_SOURCE_DIR/xcodebuild.xcresult"
-        - test_name: UnitTestsKlar
-    - deploy-to-bitrise-io@2.10.0: {}
-    - slack@4.2.1:
-        run_if: ".IsBuildFailed"
-        inputs:
-        - channel: "#mobile-alerts-ios"
-        - message: "The build run the Klar testPlan: UnitTests"
-        - webhook_url: "$SLACK_WEBHOOK"
-
-  focus_unit_test:
-    before_run:
-    - focus-pull-and-unzip-dependencies
-    steps:
-    - script@1.2.1:
-        title: Test without Building
-        inputs:
-        - content: |
-            #!/usr/bin/env bash
-            set -ex
-            ls ./Users/vagrant/git/focus-ios/Blockzilla.xcodeproj/
-            cp -r ./Users/vagrant/git/focus-ios/Blockzilla.xcodeproj/* .
-            mv ./Users/vagrant/git/* .
-            ls -la
-            echo "-- test-without-building --"
-            xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Focus_UnitTests_iphonesimulator18.2-arm64.xctestrun"
-    - custom-test-results-export@1.0.0:
-        inputs:
-        - search_pattern: "$BITRISE_SOURCE_DIR/xcodebuild.xcresult"
-        - test_name: UnitTests
-    - deploy-to-bitrise-io@2.10.0: {}
-    - slack@4.2.1:
-        run_if: ".IsBuildFailed"
-        inputs:
-        - channel: "#mobile-alerts-ios"
-        - message: "The build run the Focus testPlan: UnitTests"
-        - webhook_url: "$SLACK_WEBHOOK"
 
   # # FOCUS UTILITIES WORKFLOWS
   focus-clone-and-build-dependencies:
@@ -1928,24 +1830,6 @@ workflows:
             ./checkout.sh
         title: ContentBlockerGen
 
-  focus-pull-and-unzip-dependencies:
-    description: Pulls and unzip the dependencies from previous stage
-    steps:
-    - pull-intermediate-files@1.2.1:
-        inputs:
-        - verbose: true
-        - artifact_sources: build_applications.focus_configure_build
-    - script@1.2.1:
-        title: Unzip
-        inputs:
-        - content: |
-            set -euxo pipefail
-            echo "$DERIVED_DATA_DIR"
-            echo "-- unzip -- "
-            exec unzip "${DERIVED_DATA_DIR}"
-            echo "show dir"
-            ls
-
   focus-set-project-version:
     steps:
     - set-xcode-build-number@1:
@@ -2280,6 +2164,15 @@ app:
   - opts:
       is_expand: false
     BITRISE_NIGHTLY_VERSION: '9000'
+  - opts:
+      is_expand: false
+    BITRISE_PROJECT_PATH: './firefox-ios/Client.xcodeproj'
+  - opts:
+      is_expand: false
+    BITRISE_SCHEME: 'Fennec'
+  - opts:
+      is_expand: false
+    BITRISE_DESTINATION: 'platform=iOS Simulator,name=Bitrise iOS default,OS=latest'
 
 
 trigger_map:
diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj
index 4d8c7b9ad0d63..50b658b773255 100644
--- a/firefox-ios/Client.xcodeproj/project.pbxproj
+++ b/firefox-ios/Client.xcodeproj/project.pbxproj
@@ -1281,7 +1281,7 @@
 		B1664E9E2B163B7A005D4C71 /* CreditCardsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1664E9D2B163B7A005D4C71 /* CreditCardsTests.swift */; };
 		B1B95C622D3680DB00FD1337 /* ShareToolbarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1B95C612D3680DB00FD1337 /* ShareToolbarTests.swift */; };
 		B1CA62822C0DB43600D31625 /* MultiWindowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1CA62812C0DB43600D31625 /* MultiWindowTests.swift */; };
-		B1E156A62CD5080E009DF9E5 /* AddressesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E156A52CD5080E009DF9E5 /* AddressesTests.swift */; };
+		B1E156A62CD5080E009DF9E5 /* C_AddressesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E156A52CD5080E009DF9E5 /* C_AddressesTests.swift */; };
 		B1F90EC12BB3F6B600A4D431 /* ZoomingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1F90EC02BB3F6B600A4D431 /* ZoomingTests.swift */; };
 		B236204B2B851FE1000B1DE7 /* AddressAutoFillBottomSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B236204A2B851FE0000B1DE7 /* AddressAutoFillBottomSheetView.swift */; };
 		B236204D2B8673DE000B1DE7 /* AddressScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B236204C2B8673DE000B1DE7 /* AddressScrollView.swift */; };
@@ -1764,13 +1764,10 @@
 		E1AEC17A286E0CF500062E29 /* WebViewNavigationHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AEC175286E0CF500062E29 /* WebViewNavigationHandlerTests.swift */; };
 		E1AF27362A13BDFE00CE5991 /* EngagementNotificationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AF27352A13BDFE00CE5991 /* EngagementNotificationTests.swift */; };
 		E1AF27442A17BCF700CE5991 /* engagementNotificationWithoutConditions.json in Resources */ = {isa = PBXBuildFile; fileRef = E1AF27432A17BCF700CE5991 /* engagementNotificationWithoutConditions.json */; };
-		E1AF3560286DE5F800960045 /* Smoketest3.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF3558286DE5F600960045 /* Smoketest3.xctestplan */; };
-		E1AF3561286DE5F800960045 /* Smoketest4.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF3559286DE5F600960045 /* Smoketest4.xctestplan */; };
-		E1AF3562286DE5F800960045 /* Smoketest2.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355A286DE5F600960045 /* Smoketest2.xctestplan */; };
 		E1AF3563286DE5F800960045 /* FullFunctionalTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355B286DE5F600960045 /* FullFunctionalTestPlan.xctestplan */; };
 		E1AF3564286DE5F800960045 /* SyncIntegrationTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355C286DE5F600960045 /* SyncIntegrationTestPlan.xctestplan */; };
 		E1AF3565286DE5F800960045 /* UnitTest.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355D286DE5F700960045 /* UnitTest.xctestplan */; };
-		E1AF3566286DE5F800960045 /* Smoketest1.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355E286DE5F700960045 /* Smoketest1.xctestplan */; };
+		E1AF3566286DE5F800960045 /* Smoketest.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355E286DE5F700960045 /* Smoketest.xctestplan */; };
 		E1AF3567286DE5F800960045 /* PerformanceTestPlan.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = E1AF355F286DE5F700960045 /* PerformanceTestPlan.xctestplan */; };
 		E1AFBAF9292EA0330065E35E /* SendToDeviceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1AFBAF8292EA0330065E35E /* SendToDeviceHelper.swift */; };
 		E1B04A9D28E20A8300670E54 /* InstructionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1B04A9C28E20A8300670E54 /* InstructionsView.swift */; };
@@ -8826,7 +8823,7 @@
 		B1CA62812C0DB43600D31625 /* MultiWindowTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiWindowTests.swift; sourceTree = "<group>"; };
 		B1D14C77AD55FE126B7904D8 /* oc */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = oc; path = oc.lproj/PrivateBrowsing.strings; sourceTree = "<group>"; };
 		B1D74C6B9DE786A50986BB1A /* ur */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ur; path = "ur.lproj/Default Browser.strings"; sourceTree = "<group>"; };
-		B1E156A52CD5080E009DF9E5 /* AddressesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressesTests.swift; sourceTree = "<group>"; };
+		B1E156A52CD5080E009DF9E5 /* C_AddressesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = C_AddressesTests.swift; sourceTree = "<group>"; };
 		B1F04E16A0BF365D67AD0C6F /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Search.strings; sourceTree = "<group>"; };
 		B1F90EC02BB3F6B600A4D431 /* ZoomingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomingTests.swift; sourceTree = "<group>"; };
 		B236204A2B851FE0000B1DE7 /* AddressAutoFillBottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressAutoFillBottomSheetView.swift; sourceTree = "<group>"; };
@@ -9884,13 +9881,10 @@
 		E1AEC175286E0CF500062E29 /* WebViewNavigationHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebViewNavigationHandlerTests.swift; sourceTree = "<group>"; };
 		E1AF27352A13BDFE00CE5991 /* EngagementNotificationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EngagementNotificationTests.swift; sourceTree = "<group>"; };
 		E1AF27432A17BCF700CE5991 /* engagementNotificationWithoutConditions.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = engagementNotificationWithoutConditions.json; sourceTree = "<group>"; };
-		E1AF3558286DE5F600960045 /* Smoketest3.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Smoketest3.xctestplan; sourceTree = "<group>"; };
-		E1AF3559286DE5F600960045 /* Smoketest4.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Smoketest4.xctestplan; sourceTree = "<group>"; };
-		E1AF355A286DE5F600960045 /* Smoketest2.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Smoketest2.xctestplan; sourceTree = "<group>"; };
 		E1AF355B286DE5F600960045 /* FullFunctionalTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FullFunctionalTestPlan.xctestplan; sourceTree = "<group>"; };
 		E1AF355C286DE5F600960045 /* SyncIntegrationTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SyncIntegrationTestPlan.xctestplan; sourceTree = "<group>"; };
 		E1AF355D286DE5F700960045 /* UnitTest.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UnitTest.xctestplan; sourceTree = "<group>"; };
-		E1AF355E286DE5F700960045 /* Smoketest1.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Smoketest1.xctestplan; sourceTree = "<group>"; };
+		E1AF355E286DE5F700960045 /* Smoketest.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Smoketest.xctestplan; sourceTree = "<group>"; };
 		E1AF355F286DE5F700960045 /* PerformanceTestPlan.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PerformanceTestPlan.xctestplan; sourceTree = "<group>"; };
 		E1AFBAF8292EA0330065E35E /* SendToDeviceHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToDeviceHelper.swift; sourceTree = "<group>"; };
 		E1B04A9C28E20A8300670E54 /* InstructionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstructionsView.swift; sourceTree = "<group>"; };
@@ -11349,7 +11343,7 @@
 			isa = PBXGroup;
 			children = (
 				3B546EBF1D95ECAE00BDBE36 /* ActivityStreamTest.swift */,
-				B1E156A52CD5080E009DF9E5 /* AddressesTests.swift */,
+				B1E156A52CD5080E009DF9E5 /* C_AddressesTests.swift */,
 				0B3D670D1E09B90B00C1EFC7 /* AuthenticationTest.swift */,
 				0B305E1A1E3A98A900BE0767 /* BookmarksTests.swift */,
 				2CF9D9A920067FA10083DF2A /* BrowsingPDFTests.swift */,
@@ -14210,10 +14204,7 @@
 				7B3632D21C2983F000D12AF9 /* L10nSnapshotTests */,
 				E1AF355F286DE5F700960045 /* PerformanceTestPlan.xctestplan */,
 				E6F9650D1B2F1CF20034B023 /* SharedTests */,
-				E1AF355A286DE5F600960045 /* Smoketest2.xctestplan */,
-				E1AF3558286DE5F600960045 /* Smoketest3.xctestplan */,
-				E1AF3559286DE5F600960045 /* Smoketest4.xctestplan */,
-				E1AF355E286DE5F700960045 /* Smoketest1.xctestplan */,
+				E1AF355E286DE5F700960045 /* Smoketest.xctestplan */,
 				3B43E3D11D95C48D00BBA9DB /* StoragePerfTests */,
 				2FCAE22A1ABB51F800877008 /* StorageTests */,
 				E1AF355C286DE5F600960045 /* SyncIntegrationTestPlan.xctestplan */,
@@ -16202,7 +16193,6 @@
 				E1AF27442A17BCF700CE5991 /* engagementNotificationWithoutConditions.json in Resources */,
 				E69922171B94E3EF007C480D /* Licenses.html in Resources */,
 				8A1F6C2F2BC5A62400DA6F86 /* PrivacyInfo.xcprivacy in Resources */,
-				E1AF3560286DE5F800960045 /* Smoketest3.xctestplan in Resources */,
 				8A1A93592B757C7C0069C190 /* landscape.json in Resources */,
 				E4CD9F5B1A71506C00318571 /* Reader.css in Resources */,
 				5FACA10C2D099A9E00B289BC /* AccessibilityTestPlan.xctestplan in Resources */,
@@ -16213,7 +16203,6 @@
 				1D91C1842CF11EA500B24960 /* disconnect-block-cryptomining.json in Resources */,
 				78CD8C9E2D4150D800CA1BBF /* L10nSnapshotTests.xctestplan in Resources */,
 				39F4C0FA2045D87400746155 /* FocusHelper.js in Resources */,
-				E1AF3562286DE5F800960045 /* Smoketest2.xctestplan in Resources */,
 				8C29376C2BF79EE000146613 /* AddressFormManager.mjs in Resources */,
 				43175DB626B8774D00C41C31 /* Ads.js in Resources */,
 				D0FCF8081FE4772D004A7995 /* MainFrameAtDocumentStart.js in Resources */,
@@ -16223,8 +16212,7 @@
 				8A1A93582B757C7C0069C190 /* gradient.json in Resources */,
 				74821FFE1DB6D3AC00EEEA72 /* MailSchemes.plist in Resources */,
 				D308EE561CBF0BF5006843F2 /* CertError.css in Resources */,
-				E1AF3566286DE5F800960045 /* Smoketest1.xctestplan in Resources */,
-				E1AF3561286DE5F800960045 /* Smoketest4.xctestplan in Resources */,
+				E1AF3566286DE5F800960045 /* Smoketest.xctestplan in Resources */,
 				8A2B1A5D28216C4D0061216B /* Debug.xcconfig in Resources */,
 				0BA1E00E1B03FB0B007675AF /* NetError.html in Resources */,
 				23BEA768251A99ED00A014BF /* NewYorkMedium-BoldItalic.otf in Resources */,
@@ -16715,7 +16703,7 @@
 				2CF9D9AA20067FA10083DF2A /* BrowsingPDFTests.swift in Sources */,
 				B1158F2A2B5029F200AC9D70 /* URLValidationTests.swift in Sources */,
 				4FB4AF7526E7E789005FDF91 /* HomeButtonTests.swift in Sources */,
-				B1E156A62CD5080E009DF9E5 /* AddressesTests.swift in Sources */,
+				B1E156A62CD5080E009DF9E5 /* C_AddressesTests.swift in Sources */,
 				0BC9C9C41F26F54D000E8AB5 /* SiteLoadTest.swift in Sources */,
 				B12DDFED2A8DE825008CE9CF /* ToolbarMenuTests.swift in Sources */,
 				2C4B6BF320349EB800A009C2 /* OnboardingTests.swift in Sources */,
diff --git a/firefox-ios/Client.xcodeproj/xcshareddata/xcschemes/Fennec.xcscheme b/firefox-ios/Client.xcodeproj/xcshareddata/xcschemes/Fennec.xcscheme
index 1b31ef4adb539..b0396150c0888 100644
--- a/firefox-ios/Client.xcodeproj/xcshareddata/xcschemes/Fennec.xcscheme
+++ b/firefox-ios/Client.xcodeproj/xcshareddata/xcschemes/Fennec.xcscheme
@@ -246,16 +246,7 @@
             default = "YES">
          </TestPlanReference>
          <TestPlanReference
-            reference = "container:firefox-ios-tests/Tests/Smoketest1.xctestplan">
-         </TestPlanReference>
-         <TestPlanReference
-            reference = "container:firefox-ios-tests/Tests/Smoketest4.xctestplan">
-         </TestPlanReference>
-         <TestPlanReference
-            reference = "container:firefox-ios-tests/Tests/Smoketest2.xctestplan">
-         </TestPlanReference>
-         <TestPlanReference
-            reference = "container:firefox-ios-tests/Tests/Smoketest3.xctestplan">
+            reference = "container:firefox-ios-tests/Tests/Smoketest.xctestplan">
          </TestPlanReference>
          <TestPlanReference
             reference = "container:firefox-ios-tests/Tests/FullFunctionalTestPlan.xctestplan">
diff --git a/firefox-ios/firefox-ios-tests/Tests/Smoketest1.xctestplan b/firefox-ios/firefox-ios-tests/Tests/Smoketest.xctestplan
similarity index 66%
rename from firefox-ios/firefox-ios-tests/Tests/Smoketest1.xctestplan
rename to firefox-ios/firefox-ios-tests/Tests/Smoketest.xctestplan
index acc425e6daae5..140ecfd16a06c 100644
--- a/firefox-ios/firefox-ios-tests/Tests/Smoketest1.xctestplan
+++ b/firefox-ios/firefox-ios-tests/Tests/Smoketest.xctestplan
@@ -56,24 +56,21 @@
         "A11yTabTrayTests",
         "A11yTabTrayTests\/testAccessibility()",
         "A11yUtils",
-        "ActivityStreamTest",
         "ActivityStreamTest\/testContextMenuInLandscape()",
-        "ActivityStreamTest\/testDefaultSites()",
         "ActivityStreamTest\/testLongTapOnTopSiteOptions()",
+        "ActivityStreamTest\/testShortcutsToggle()",
+        "ActivityStreamTest\/testSiteCanBeAddedToShortcuts()",
         "ActivityStreamTest\/testTopSites1ShareDefaultTopSite()",
         "ActivityStreamTest\/testTopSites2Add()",
         "ActivityStreamTest\/testTopSites3RemoveDefaultTopSite()",
         "ActivityStreamTest\/testTopSites4OpenInNewTab()",
         "ActivityStreamTest\/testTopSitesAdd()",
-        "ActivityStreamTest\/testTopSitesOpenInNewPrivateTab()",
-        "ActivityStreamTest\/testTopSitesOpenInNewPrivateTabDefaultTopSite()",
         "ActivityStreamTest\/testTopSitesOpenInNewTab()",
         "ActivityStreamTest\/testTopSitesRemoveAllExceptDefaultClearPrivateData()",
         "ActivityStreamTest\/testTopSitesRemoveAllExceptPinnedClearPrivateData()",
         "ActivityStreamTest\/testTopSitesRemoveDefaultTopSite()",
         "ActivityStreamTest\/testTopSitesShareDefaultTopSite()",
         "ActivityStreamTest\/testTopSitesShiftAfterRemovingOne()",
-        "AddressesTests\/testAddNewAddressAllFieldsFilled()",
         "AddressesTests\/testAddNewAddressCityFilled()",
         "AddressesTests\/testAddNewAddressCountry()",
         "AddressesTests\/testAddNewAddressEmailFilled()",
@@ -82,7 +79,6 @@
         "AddressesTests\/testAddNewAddressPhoneFilled()",
         "AddressesTests\/testAddNewAddressPostalCodeFilled()",
         "AddressesTests\/testAddNewAddressStreetAddressFilled()",
-        "AddressesTests\/testAddressOptionIsAvailableInSettingsMenu()",
         "AddressesTests\/testAutofillAddressesByTapingAddressField()",
         "AddressesTests\/testAutofillAddressesByTapingCityField()",
         "AddressesTests\/testAutofillAddressesByTapingCountryField()",
@@ -92,7 +88,6 @@
         "AddressesTests\/testAutofillAddressesByTapingPostalCodeField()",
         "AddressesTests\/testAutofillAddressesByTapingStateField()",
         "AddressesTests\/testDeleteAllAddresses()",
-        "AddressesTests\/testRedirectToSettingsByTappingManageAddresses()",
         "AddressesTests\/testToggleAddressOnOff()",
         "AddressesTests\/testUpdateAddressFieldCity()",
         "AddressesTests\/testUpdateAddressFieldCountry()",
@@ -120,30 +115,52 @@
         "AuthenticationTest\/testWrongPasscodeAttemptsPersistAcrossEntryAndConfirmation()",
         "AuthenticationTest\/testWrongPasscodeDisplaysAttemptsAndMaxError()",
         "BaseTestCase",
-        "BookmarksTests",
         "BookmarksTests\/testAccessBookmarksFromContextMenu()",
         "BookmarksTests\/testAddBookmark()",
         "BookmarksTests\/testAddNewFolder()",
         "BookmarksTests\/testAddNewMarker()",
         "BookmarksTests\/testBookmark()",
-        "BookmarksTests\/testBookmarkLibraryAddDeleteBookmark()",
         "BookmarksTests\/testBookmarkingUI()",
-        "BookmarksTests\/testBookmarksAwesomeBar()",
         "BookmarksTests\/testDeleteBookmarkContextMenu()",
         "BookmarksTests\/testDeleteBookmarkSwiping()",
         "BookmarksTests\/testDesktopFoldersArePresent()",
         "BookmarksTests\/testEditBookmark()",
         "BookmarksTests\/testLongTapRecentlySavedLink()",
         "BookmarksTests\/testRecentlyBookmarked()",
-        "BookmarksTests\/testUndoDeleteBookmark()",
-        "BrowsingPDFTests",
+        "BrowsingPDFTests\/testLongPressOnPDFLink()",
+        "BrowsingPDFTests\/testLongPressOnPDFLinkToAddToReadingList()",
+        "BrowsingPDFTests\/testOpenLinkFromPDF()",
+        "BrowsingPDFTests\/testOpenPDFViewer()",
+        "C_AddressesTests\/testAddNewAddressCityFilled()",
+        "C_AddressesTests\/testAddNewAddressCountry()",
+        "C_AddressesTests\/testAddNewAddressEmailFilled()",
+        "C_AddressesTests\/testAddNewAddressNameFilled()",
+        "C_AddressesTests\/testAddNewAddressOrganizationFilled()",
+        "C_AddressesTests\/testAddNewAddressPhoneFilled()",
+        "C_AddressesTests\/testAddNewAddressPostalCodeFilled()",
+        "C_AddressesTests\/testAddNewAddressStreetAddressFilled()",
+        "C_AddressesTests\/testAutofillAddressesByTapingAddressField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingCityField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingCountryField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingEmailField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingOrganizationField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingPhoneField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingPostalCodeField()",
+        "C_AddressesTests\/testAutofillAddressesByTapingStateField()",
+        "C_AddressesTests\/testDeleteAllAddresses()",
+        "C_AddressesTests\/testToggleAddressOnOff()",
+        "C_AddressesTests\/testUpdateAddressFieldCity()",
+        "C_AddressesTests\/testUpdateAddressFieldCountry()",
+        "C_AddressesTests\/testUpdateAddressFieldEmail()",
+        "C_AddressesTests\/testUpdateAddressFieldName()",
+        "C_AddressesTests\/testUpdateAddressFieldOrganization()",
+        "C_AddressesTests\/testUpdateAddressFieldPhone()",
+        "C_AddressesTests\/testUpdateAddressFieldStreet()",
+        "C_AddressesTests\/testUpdateAddressFieldZIP()",
+        "C_AddressesTests\/testUpdateAllAddressFields()",
         "ClipBoardTests\/testClipboard()",
         "ClipBoardTests\/testCopyLink()",
-        "CreditCardsTests\/testAccessingTheCreditCardsSection()",
-        "CreditCardsTests\/testAutofillCreditCardsToggleOnOff()",
         "CreditCardsTests\/testCreditCardsAutofill()",
-        "CreditCardsTests\/testDeleteButtonFromEditCard()",
-        "CreditCardsTests\/testEditSavedCardsUI()",
         "CreditCardsTests\/testErrorStatesCreditCards()",
         "CreditCardsTests\/testManageCreditCardsOption()",
         "CreditCardsTests\/testRedirectionToCreditCardsSection()",
@@ -170,7 +187,13 @@
         "DownloadsTests\/testRemoveUserDataRemovesDownloadedFiles()",
         "DownloadsTests\/testShareDownloadedFile()",
         "DragAndDropTestIpad",
-        "DragAndDropTests",
+        "DragAndDropTestIpad\/test4RearrangeTabs()",
+        "DragAndDropTestIpad\/testDragAddressBarIntoSearchBox()",
+        "DragAndDropTestIpad\/testRearrangeTabsTabTrayIsKeptinTopTabs()",
+        "DragAndDropTests\/testDragAndDropHomeTabTabsTray()",
+        "DragAndDropTests\/testRearrangeMoreThan3TabsTabTray()",
+        "DragAndDropTests\/testRearrangeTabsPrivateModeTabTray()",
+        "DragAndDropTests\/testRearrangeTabsTabTrayLandscape()",
         "EngagementNotificationTests",
         "ExperimentIntegrationTests",
         "FindInPageTests\/testBarDisappearsWhenOpeningTabsTray()",
@@ -184,7 +207,6 @@
         "FindInPageTests\/testQueryWithNoMatches()",
         "FirefoxSuggestTest",
         "FxScreenGraphTests",
-        "HistoryTests",
         "HistoryTests\/testClearHistoryFromSettings()",
         "HistoryTests\/testClearRecentlyClosedHistory()",
         "HistoryTests\/testEmptyHistoryListFirstTime()",
@@ -199,31 +221,50 @@
         "HistoryTests\/testRecentlyClosedWebsiteOpen()",
         "HistoryTests\/testRemoveAllTabsButtonRecentlyClosedHistory()",
         "HomeButtonTests",
-        "HomePageSettingsUITests",
         "HomePageSettingsUITests\/testChangeHomeSettingsLabel()",
         "HomePageSettingsUITests\/testCheckHomeSettingsByDefault()",
         "HomePageSettingsUITests\/testClipboard()",
+        "HomePageSettingsUITests\/testDisableTopSitesSettingsRemovesSection()",
+        "HomePageSettingsUITests\/testJumpBackIn()",
+        "HomePageSettingsUITests\/testRecentlySaved()",
         "HomePageSettingsUITests\/testSetCustomURLAsHome()",
         "HomePageSettingsUITests\/testSetFirefoxHomeAsHome()",
+        "HomePageSettingsUITests\/testShortcutsRows()",
         "HomePageSettingsUITests\/testTopSitesCustomNumberOfRows()",
         "HomePageSettingsUITests\/testTyping()",
         "InactiveTabsTest\/testInactiveTabs()",
         "IntegrationTests",
         "IpadOnlyTestCase",
         "IphoneOnlyTestCase",
-        "JumpBackInTests",
+        "JumpBackInTests\/testJumpBackInSection()",
+        "JumpBackInTests\/testLongTapOnJumpBackInLink()",
         "LibraryTestsIpad",
         "LibraryTestsIphone",
-        "LoginTest",
+        "LoginTest\/testAddDuplicateLogin()",
+        "LoginTest\/testCannotSaveLoginWithoutAllFields()",
+        "LoginTest\/testDeleteLogin()",
+        "LoginTest\/testDoNotSaveLogin()",
+        "LoginTest\/testEditOneLoginEntry()",
+        "LoginTest\/testLoginFreshInstallMessage()",
+        "LoginTest\/testLoginsListFromBrowserTabMenu()",
+        "LoginTest\/testSavedLoginSelectUnselect()",
+        "LoginTest\/testSearchLogin()",
+        "LoginTest\/testSearchSavedLoginsByURL()",
+        "LoginTest\/testSearchSavedLoginsByUsername()",
+        "LoginTest\/testVerifyPasswordsSettingMenu()",
         "MicrosurveyTests",
         "MultiWindowTests",
-        "NavigationTest",
+        "NavigationTest\/testBackArrowNavigation()",
+        "NavigationTest\/testBookmarkLink()",
         "NavigationTest\/testCopyLink()",
         "NavigationTest\/testCopyLinkPrivateMode()",
         "NavigationTest\/testDownloadLink()",
         "NavigationTest\/testLongPressLinkOptionsPrivateMode()",
         "NavigationTest\/testLongPressOnAddressBar()",
         "NavigationTest\/testNavigation()",
+        "NavigationTest\/testOpenExternalLink()",
+        "NavigationTest\/testOpenInNewPrivateTab()",
+        "NavigationTest\/testOpenInNewTab()",
         "NavigationTest\/testScrollsToTopWithMultipleTabs()",
         "NavigationTest\/testShareLink()",
         "NavigationTest\/testShareLinkPrivateMode()",
@@ -231,10 +272,36 @@
         "NavigationTest\/testTapSignInShowsFxAFromTour()",
         "NavigationTest\/testTapSigninShowsFxAFromSettings()",
         "NavigationTest\/testWriteToChildPopupTab()",
-        "NewTabSettingsTest",
         "NewTabSettingsTest\/testChangeNewTabSettingsLabel()",
         "NewTabSettingsTest\/testChangeNewTabSettingsShowFirefoxHome()",
         "NightModeTests",
+        "O_AddressesTests\/testAddNewAddressCityFilled()",
+        "O_AddressesTests\/testAddNewAddressCountry()",
+        "O_AddressesTests\/testAddNewAddressEmailFilled()",
+        "O_AddressesTests\/testAddNewAddressNameFilled()",
+        "O_AddressesTests\/testAddNewAddressOrganizationFilled()",
+        "O_AddressesTests\/testAddNewAddressPhoneFilled()",
+        "O_AddressesTests\/testAddNewAddressPostalCodeFilled()",
+        "O_AddressesTests\/testAddNewAddressStreetAddressFilled()",
+        "O_AddressesTests\/testAutofillAddressesByTapingAddressField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingCityField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingCountryField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingEmailField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingOrganizationField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingPhoneField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingPostalCodeField()",
+        "O_AddressesTests\/testAutofillAddressesByTapingStateField()",
+        "O_AddressesTests\/testDeleteAllAddresses()",
+        "O_AddressesTests\/testToggleAddressOnOff()",
+        "O_AddressesTests\/testUpdateAddressFieldCity()",
+        "O_AddressesTests\/testUpdateAddressFieldCountry()",
+        "O_AddressesTests\/testUpdateAddressFieldEmail()",
+        "O_AddressesTests\/testUpdateAddressFieldName()",
+        "O_AddressesTests\/testUpdateAddressFieldOrganization()",
+        "O_AddressesTests\/testUpdateAddressFieldPhone()",
+        "O_AddressesTests\/testUpdateAddressFieldStreet()",
+        "O_AddressesTests\/testUpdateAddressFieldZIP()",
+        "O_AddressesTests\/testUpdateAllAddressFields()",
         "OnboardingTests\/testCloseOptionToolbarCard()",
         "OnboardingTests\/testFirstRunTourDarkMode()",
         "OnboardingTests\/testSelectBottomPlacement()",
@@ -242,15 +309,21 @@
         "OnboardingTests\/testWhatsNewPage()",
         "OpeningScreenTests",
         "PerformanceTests",
-        "PhotonActionSheetTests",
+        "PhotonActionSheetTests\/testShareSheetOpenAndCancel()",
+        "PhotonActionSheetTests\/testShareSheetSendToDevice()",
         "PocketTest",
         "PocketTests",
         "PocketTests\/testPocketEnabledByDefault()",
-        "PrivateBrowsingTest",
+        "PrivateBrowsingTest\/testAllPrivateTabsRestore()",
+        "PrivateBrowsingTest\/testClearIndexedDB()",
+        "PrivateBrowsingTest\/testClosePrivateTabsOptionClosesPrivateTabs()",
+        "PrivateBrowsingTest\/testHamburgerMenuNewPrivateTab()",
+        "PrivateBrowsingTest\/testPrivateBrowserPanelView()",
+        "PrivateBrowsingTest\/testPrivateTabDoesNotTrackHistory()",
+        "PrivateBrowsingTest\/testTabCountShowsOnlyNormalOrPrivateTabCount()",
         "PrivateBrowsingTestIpad",
         "PrivateBrowsingTestIpad\/testClosePrivateTabsOptionClosesPrivateTabsShortCutiPad()",
         "PrivateBrowsingTestIpad\/testiPadDirectAccessPrivateModeBrowserTab()",
-        "PrivateBrowsingTestIphone\/testSwitchBetweenPrivateTabsToastButton()",
         "ReadingListTests\/testAddToReadingListFromBrowserTabMenu()",
         "ReadingListTests\/testAddToReadingListPrivateMode()",
         "ReadingListTests\/testMarkAsReadAndUnreadFromReadingList()",
@@ -262,15 +335,26 @@
         "ReportSiteTests",
         "ScreenGraphTest",
         "SearchSettingsUITests",
-        "SearchTests",
         "SearchTests\/testCopyPasteComplete()",
         "SearchTests\/testDefaultSearchEngine()",
         "SearchTests\/testDismissPromptPresence()",
         "SearchTests\/testDoNotShowSuggestionsWhenEnteringURL()",
+        "SearchTests\/testFirefoxSuggest()",
         "SearchTests\/testPromptPresence()",
         "SearchTests\/testSearchIconOnAboutHome()",
+        "SearchTests\/testSearchSuggestions()",
         "SearchTests\/testSearchWithFirefoxOption()",
-        "SettingsTests",
+        "SettingsTests\/testAutofillPasswordSettingsOptionSubtitles()",
+        "SettingsTests\/testAutoplayOptionUI()",
+        "SettingsTests\/testBrowsingSettingsOptionSubtitles()",
+        "SettingsTests\/testCopiedLinks()",
+        "SettingsTests\/testHelpOpensSUMOInTab()",
+        "SettingsTests\/testOpenMailAppSettings()",
+        "SettingsTests\/testOpenSiriOption()",
+        "SettingsTests\/testSettingsCrashReportsOption()",
+        "SettingsTests\/testSettingsOptionSubtitlesDarkMode()",
+        "SettingsTests\/testSettingsOptionSubtitlesDarkModeLandscape()",
+        "SettingsTests\/testSettingsOptionSubtitlesLandspace()",
         "ShareLongPressTests",
         "ShareMenuTests",
         "ShareToolbarTests",
@@ -286,23 +370,30 @@
         "TabTrayTests",
         "TabTrayTests\/testAccessibility()",
         "TabsPerformanceTest",
-        "TabsTests",
         "TabsTests\/testAddTabFromContext()",
         "TabsTests\/testCloseAllTabs()",
         "TabsTests\/testCloseAllTabsPrivateMode()",
+        "TabsTests\/testCloseAllTabsUndo()",
         "TabsTests\/testCloseOneTab()",
+        "TabsTests\/testCloseOneTabUndo()",
+        "TabsTests\/testOpenTabsViewCurrentTabThumbnail()",
         "TabsTests\/testSwitchBetweenTabs()",
+        "TabsTests\/testTabTrayCloseMultipleTabs()",
+        "TabsTests\/testTabTrayContextMenuCloseTab()",
         "TabsTestsIpad",
-        "TabsTestsIphone",
         "ThirdPartySearchTest",
         "TodayWidgetTests",
         "ToolbarMenuTests",
+        "ToolbarMenuTests\/testToolbarMenu()",
         "ToolbarTests",
-        "TrackingProtectionTests",
         "TrackingProtectionTests\/testBasicMoreInfo()",
         "TrackingProtectionTests\/testETPLockMenu()",
+        "TrackingProtectionTests\/testLockIconCloseMenu()",
+        "TrackingProtectionTests\/testLockIconMenu()",
+        "TrackingProtectionTests\/testLockIconSecureConnection()",
         "TrackingProtectionTests\/testMenuWhenThereAreBlockedElements()",
-        "URLValidationTests",
+        "TrackingProtectionTests\/testProtectionLevelMoreInfoMenu()",
+        "TrackingProtectionTests\/testStrictTrackingProtection()",
         "UrlBarTests",
         "WhatsNewTest",
         "ZoomingTests\/testSwitchingZoomedTabs()",
diff --git a/firefox-ios/firefox-ios-tests/Tests/Smoketest2.xctestplan b/firefox-ios/firefox-ios-tests/Tests/Smoketest2.xctestplan
deleted file mode 100644
index f58df63947653..0000000000000
--- a/firefox-ios/firefox-ios-tests/Tests/Smoketest2.xctestplan
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "A939854E-B2BB-4DCE-B79A-89210EF0E606",
-      "name" : "Configuration 1",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "codeCoverage" : false,
-    "testRepetitionMode" : "retryOnFailure"
-  },
-  "testTargets" : [
-    {
-      "skippedTests" : [
-        "A11yHomePageTests",
-        "A11yHomePageTests\/testA11yHomePageAccessibilityLabels()",
-        "A11yHomePageTests\/testA11yHomePageAudit()",
-        "A11yHomePageTests\/testA11yHomePageVoiceOverNavigation()",
-        "A11yOnboardingTests",
-        "A11yOnboardingTests\/testA11yFirstRunTour()",
-        "A11ySearchTest",
-        "A11ySearchTest\/testA11ySearchSuggestions()",
-        "A11ySettingsTests",
-        "A11ySettingsTests\/testAutofillsAndPasswordAccessibilityReport()",
-        "A11ySettingsTests\/testAutofillsAndPasswordPageAudit()",
-        "A11ySettingsTests\/testDataManagementPageAudit()",
-        "A11ySettingsTests\/testNotificationsAccessibilityReport()",
-        "A11ySettingsTests\/testNotificationsPageAudit()",
-        "A11ySettingsTests\/testSettingAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingAppIconAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingAppIconPageAudit()",
-        "A11ySettingsTests\/testSettingBrowsingAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingBrowsingPageAudit()",
-        "A11ySettingsTests\/testSettingHomePageAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingHomePagePageAudit()",
-        "A11ySettingsTests\/testSettingMainMenuAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingMainMenuExtendedAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingMenuPageAudit()",
-        "A11ySettingsTests\/testSettingNewTabAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingNewTabPageAudit()",
-        "A11ySettingsTests\/testSettingSearchAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSearchPageAudit()",
-        "A11ySettingsTests\/testSettingSiriShortcutAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSiriShortcutPageAudit()",
-        "A11ySettingsTests\/testSettingSyncAndSaveDataAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSyncAndSaveDataPageAudit()",
-        "A11ySettingsTests\/testSettingThemeAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingThemePageAudit()",
-        "A11ySettingsTests\/testSettingToolbarAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingToolbarPageAudit()",
-        "A11ySettingsTests\/testTrackingProtectionAccessibilityReport()",
-        "A11ySettingsTests\/testTrackingProtectionPageAudit()",
-        "A11yTabTrayTests",
-        "A11yTabTrayTests\/testAccessibility()",
-        "A11yUtils",
-        "ActivityStreamTest",
-        "AddressesTests\/testAddNewAddressAllFieldsFilled()",
-        "AddressesTests\/testAddNewAddressCityFilled()",
-        "AddressesTests\/testAddNewAddressCountry()",
-        "AddressesTests\/testAddNewAddressEmailFilled()",
-        "AddressesTests\/testAddNewAddressNameFilled()",
-        "AddressesTests\/testAddNewAddressOrganizationFilled()",
-        "AddressesTests\/testAddNewAddressPhoneFilled()",
-        "AddressesTests\/testAddNewAddressPostalCodeFilled()",
-        "AddressesTests\/testAddNewAddressStreetAddressFilled()",
-        "AddressesTests\/testAutofillAddressesByTapingAddressField()",
-        "AddressesTests\/testAutofillAddressesByTapingCityField()",
-        "AddressesTests\/testAutofillAddressesByTapingCountryField()",
-        "AddressesTests\/testAutofillAddressesByTapingEmailField()",
-        "AddressesTests\/testAutofillAddressesByTapingNameField()",
-        "AddressesTests\/testAutofillAddressesByTapingOrganizationField()",
-        "AddressesTests\/testAutofillAddressesByTapingPhoneField()",
-        "AddressesTests\/testAutofillAddressesByTapingPostalCodeField()",
-        "AddressesTests\/testAutofillAddressesByTapingStateField()",
-        "AddressesTests\/testAutofillOptionNotAvailableToggleOFF()",
-        "AddressesTests\/testDeleteAddress()",
-        "AddressesTests\/testDeleteAllAddresses()",
-        "AddressesTests\/testRedirectToSettingsByTappingManageAddresses()",
-        "AddressesTests\/testToggleAddressOnOff()",
-        "AddressesTests\/testUpdateAddressFieldCity()",
-        "AddressesTests\/testUpdateAddressFieldCountry()",
-        "AddressesTests\/testUpdateAddressFieldEmail()",
-        "AddressesTests\/testUpdateAddressFieldName()",
-        "AddressesTests\/testUpdateAddressFieldOrganization()",
-        "AddressesTests\/testUpdateAddressFieldPhone()",
-        "AddressesTests\/testUpdateAddressFieldStreet()",
-        "AddressesTests\/testUpdateAddressFieldZIP()",
-        "AddressesTests\/testUpdateAllAddressFields()",
-        "AuthenticationTest",
-        "BaseTestCase",
-        "BookmarksTests",
-        "BrowsingPDFTests\/testLongPressOnPDFLink()",
-        "BrowsingPDFTests\/testLongPressOnPDFLinkToAddToReadingList()",
-        "BrowsingPDFTests\/testOpenLinkFromPDF()",
-        "BrowsingPDFTests\/testOpenPDFViewer()",
-        "ClipBoardTests",
-        "CreditCardsTests",
-        "CronTabsPerformanceTest",
-        "DataManagementTests",
-        "DatabaseFixtureTest",
-        "DesktopModeTestsIpad",
-        "DesktopModeTestsIphone",
-        "DisplaySettingTests",
-        "DomainAutocompleteTests",
-        "DownloadFilesTests",
-        "DownloadsTests",
-        "DragAndDropTestIpad",
-        "DragAndDropTests",
-        "EngagementNotificationTests",
-        "ExperimentIntegrationTests",
-        "FindInPageTests",
-        "FirefoxSuggestTest\/testFirefoxSuggestExists()",
-        "FxScreenGraphTests",
-        "HistoryTests",
-        "HomeButtonTests",
-        "HomePageSettingsUITests",
-        "InactiveTabsTest",
-        "IntegrationTests",
-        "IpadOnlyTestCase",
-        "IphoneOnlyTestCase",
-        "JumpBackInTests",
-        "LibraryTestsIpad",
-        "LibraryTestsIphone",
-        "LoginTest\/testAddDuplicateLogin()",
-        "LoginTest\/testCannotSaveLoginWithoutAllFields()",
-        "LoginTest\/testCreateLoginManually()",
-        "LoginTest\/testDeleteLogin()",
-        "LoginTest\/testDismissedChangesAreNotSaved()",
-        "LoginTest\/testDoNotSaveLogin()",
-        "LoginTest\/testEditOneLoginEntry()",
-        "LoginTest\/testLoginCopyPaste()",
-        "LoginTest\/testLoginFreshInstallMessage()",
-        "LoginTest\/testLoginsListFromBrowserTabMenu()",
-        "LoginTest\/testSaveLogin()",
-        "LoginTest\/testSavedLoginAutofilled()",
-        "LoginTest\/testSavedLoginSelectUnselect()",
-        "LoginTest\/testSearchLogin()",
-        "LoginTest\/testSearchSavedLoginsByURL()",
-        "LoginTest\/testSearchSavedLoginsByUsername()",
-        "LoginTest\/testVerifyPasswordsSettingMenu()",
-        "LoginTest\/testVerifyUpdatedPasswordIsNotSaved()",
-        "MicrosurveyTests",
-        "MultiWindowTests",
-        "NavigationTest",
-        "NewTabSettingsTest\/testChangeNewTabSettingsLabel()",
-        "NewTabSettingsTest\/testChangeNewTabSettingsShowBlankPage()",
-        "NewTabSettingsTest\/testChangeNewTabSettingsShowCustomURL()",
-        "NewTabSettingsTest\/testChangeNewTabSettingsShowFirefoxHome()",
-        "NewTabSettingsTest\/testCheckNewTabSettingsByDefault()",
-        "NightModeTests",
-        "OnboardingTests\/testCloseOptionToolbarCard()",
-        "OnboardingTests\/testCloseTour()",
-        "OnboardingTests\/testFirstRunTour()",
-        "OnboardingTests\/testFirstRunTourDarkMode()",
-        "OnboardingTests\/testOnboardingSignIn()",
-        "OnboardingTests\/testSelectBottomPlacement()",
-        "OnboardingTests\/testSelectTopPlacement()",
-        "OnboardingTests\/testWhatsNewPage()",
-        "OpeningScreenTests",
-        "PerformanceTests",
-        "PhotonActionSheetTests\/testShareSheetOpenAndCancel()",
-        "PhotonActionSheetTests\/testShareSheetSendToDevice()",
-        "PocketTest",
-        "PocketTests",
-        "PrivateBrowsingTest",
-        "PrivateBrowsingTestIpad",
-        "PrivateBrowsingTestIpad\/testClosePrivateTabsOptionClosesPrivateTabsShortCutiPad()",
-        "PrivateBrowsingTestIpad\/testiPadDirectAccessPrivateModeBrowserTab()",
-        "PrivateBrowsingTestIphone\/testSwitchBetweenPrivateTabsToastButton()",
-        "ReadingListTests",
-        "ReportSiteTests",
-        "ScreenGraphTest",
-        "SearchSettingsUITests",
-        "SearchTests\/testCopyPasteComplete()",
-        "SearchTests\/testDefaultSearchEngine()",
-        "SearchTests\/testDoNotShowSuggestionsWhenEnteringURL()",
-        "SearchTests\/testFirefoxSuggest()",
-        "SearchTests\/testOpenTabsInSearchSuggestions()",
-        "SearchTests\/testPromptPresence()",
-        "SearchTests\/testSearchEngine()",
-        "SearchTests\/testSearchIconOnAboutHome()",
-        "SearchTests\/testSearchStartAfterTypingTwoWords()",
-        "SearchTests\/testSearchSuggestions()",
-        "SearchTests\/testSearchWithFirefoxOption()",
-        "SettingsTests\/testAutofillPasswordSettingsOptionSubtitles()",
-        "SettingsTests\/testAutoplayOptionUI()",
-        "SettingsTests\/testBrowsingSettingsOptionSubtitles()",
-        "SettingsTests\/testCopiedLinks()",
-        "SettingsTests\/testHelpOpensSUMOInTab()",
-        "SettingsTests\/testImageOnOff()",
-        "SettingsTests\/testOpenMailAppSettings()",
-        "SettingsTests\/testOpenSiriOption()",
-        "SettingsTests\/testSettingsCrashReportsOption()",
-        "SettingsTests\/testSettingsOptionSubtitlesDarkMode()",
-        "SettingsTests\/testSettingsOptionSubtitlesDarkModeLandscape()",
-        "SettingsTests\/testSettingsOptionSubtitlesLandspace()",
-        "ShareLongPressTests",
-        "ShareMenuTests",
-        "ShareToolbarTests",
-        "SiteLoadTest",
-        "SyncUITests",
-        "TabCounterTests",
-        "TabTrayTests",
-        "TabTrayTests\/testAccessibility()",
-        "TabsPerformanceTest",
-        "TabsTests\/testAddTabFromContext()",
-        "TabsTests\/testCloseAllTabs()",
-        "TabsTests\/testCloseAllTabsPrivateMode()",
-        "TabsTests\/testCloseAllTabsUndo()",
-        "TabsTests\/testCloseOneTab()",
-        "TabsTests\/testCloseOneTabUndo()",
-        "TabsTests\/testOpenTabsViewCurrentTabThumbnail()",
-        "TabsTests\/testSwitchBetweenTabs()",
-        "TabsTests\/testTabTrayCloseMultipleTabs()",
-        "TabsTests\/testTabTrayContextMenuCloseTab()",
-        "TabsTestsIpad",
-        "ThirdPartySearchTest",
-        "TodayWidgetTests",
-        "ToolbarMenuTests",
-        "ToolbarTests",
-        "TrackingProtectionTests\/testBasicMoreInfo()",
-        "TrackingProtectionTests\/testETPLockMenu()",
-        "TrackingProtectionTests\/testLockIconCloseMenu()",
-        "TrackingProtectionTests\/testLockIconMenu()",
-        "TrackingProtectionTests\/testLockIconSecureConnection()",
-        "TrackingProtectionTests\/testProtectionLevelMoreInfoMenu()",
-        "TrackingProtectionTests\/testStrictTrackingProtection()",
-        "URLValidationTests",
-        "UrlBarTests",
-        "WhatsNewTest",
-        "ZoomingTests"
-      ],
-      "target" : {
-        "containerPath" : "container:Client.xcodeproj",
-        "identifier" : "3BFE4B061D342FB800DDF53F",
-        "name" : "XCUITests"
-      }
-    }
-  ],
-  "version" : 1
-}
diff --git a/firefox-ios/firefox-ios-tests/Tests/Smoketest3.xctestplan b/firefox-ios/firefox-ios-tests/Tests/Smoketest3.xctestplan
deleted file mode 100644
index 8502c0a4938dc..0000000000000
--- a/firefox-ios/firefox-ios-tests/Tests/Smoketest3.xctestplan
+++ /dev/null
@@ -1,247 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "402563FE-4350-4DA7-A93B-8B13A5B94629",
-      "name" : "Configuration 1",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "codeCoverage" : false,
-    "testRepetitionMode" : "retryOnFailure"
-  },
-  "testTargets" : [
-    {
-      "skippedTests" : [
-        "A11yHomePageTests",
-        "A11yHomePageTests\/testA11yHomePageAccessibilityLabels()",
-        "A11yHomePageTests\/testA11yHomePageAudit()",
-        "A11yHomePageTests\/testA11yHomePageVoiceOverNavigation()",
-        "A11yOnboardingTests",
-        "A11yOnboardingTests\/testA11yFirstRunTour()",
-        "A11ySearchTest",
-        "A11ySearchTest\/testA11ySearchSuggestions()",
-        "A11ySettingsTests",
-        "A11ySettingsTests\/testAutofillsAndPasswordAccessibilityReport()",
-        "A11ySettingsTests\/testAutofillsAndPasswordPageAudit()",
-        "A11ySettingsTests\/testDataManagementPageAudit()",
-        "A11ySettingsTests\/testNotificationsAccessibilityReport()",
-        "A11ySettingsTests\/testNotificationsPageAudit()",
-        "A11ySettingsTests\/testSettingAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingAppIconAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingAppIconPageAudit()",
-        "A11ySettingsTests\/testSettingBrowsingAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingBrowsingPageAudit()",
-        "A11ySettingsTests\/testSettingHomePageAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingHomePagePageAudit()",
-        "A11ySettingsTests\/testSettingMainMenuAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingMainMenuExtendedAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingMenuPageAudit()",
-        "A11ySettingsTests\/testSettingNewTabAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingNewTabPageAudit()",
-        "A11ySettingsTests\/testSettingSearchAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSearchPageAudit()",
-        "A11ySettingsTests\/testSettingSiriShortcutAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSiriShortcutPageAudit()",
-        "A11ySettingsTests\/testSettingSyncAndSaveDataAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSyncAndSaveDataPageAudit()",
-        "A11ySettingsTests\/testSettingThemeAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingThemePageAudit()",
-        "A11ySettingsTests\/testSettingToolbarAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingToolbarPageAudit()",
-        "A11ySettingsTests\/testTrackingProtectionAccessibilityReport()",
-        "A11ySettingsTests\/testTrackingProtectionPageAudit()",
-        "A11yTabTrayTests",
-        "A11yTabTrayTests\/testAccessibility()",
-        "A11yUtils",
-        "ActivityStreamTest",
-        "AddressesTests\/testAddNewAddressCityFilled()",
-        "AddressesTests\/testAddNewAddressCountry()",
-        "AddressesTests\/testAddNewAddressEmailFilled()",
-        "AddressesTests\/testAddNewAddressNameFilled()",
-        "AddressesTests\/testAddNewAddressOrganizationFilled()",
-        "AddressesTests\/testAddNewAddressPhoneFilled()",
-        "AddressesTests\/testAddNewAddressPostalCodeFilled()",
-        "AddressesTests\/testAddNewAddressStreetAddressFilled()",
-        "AddressesTests\/testAddressOptionIsAvailableInSettingsMenu()",
-        "AddressesTests\/testAutofillAddressesByTapingAddressField()",
-        "AddressesTests\/testAutofillAddressesByTapingCityField()",
-        "AddressesTests\/testAutofillAddressesByTapingCountryField()",
-        "AddressesTests\/testAutofillAddressesByTapingEmailField()",
-        "AddressesTests\/testAutofillAddressesByTapingNameField()",
-        "AddressesTests\/testAutofillAddressesByTapingOrganizationField()",
-        "AddressesTests\/testAutofillAddressesByTapingPhoneField()",
-        "AddressesTests\/testAutofillAddressesByTapingPostalCodeField()",
-        "AddressesTests\/testAutofillAddressesByTapingStateField()",
-        "AddressesTests\/testAutofillOptionNotAvailableToggleOFF()",
-        "AddressesTests\/testDeleteAddress()",
-        "AddressesTests\/testDeleteAllAddresses()",
-        "AddressesTests\/testRedirectToSettingsByTappingManageAddresses()",
-        "AddressesTests\/testToggleAddressOnOff()",
-        "AddressesTests\/testUpdateAddressFieldCity()",
-        "AddressesTests\/testUpdateAddressFieldCountry()",
-        "AddressesTests\/testUpdateAddressFieldEmail()",
-        "AddressesTests\/testUpdateAddressFieldName()",
-        "AddressesTests\/testUpdateAddressFieldOrganization()",
-        "AddressesTests\/testUpdateAddressFieldPhone()",
-        "AddressesTests\/testUpdateAddressFieldStreet()",
-        "AddressesTests\/testUpdateAddressFieldZIP()",
-        "AddressesTests\/testUpdateAllAddressFields()",
-        "AuthenticationTest",
-        "BaseTestCase",
-        "BookmarksTests",
-        "BrowsingPDFTests",
-        "ClipBoardTests",
-        "CreditCardsTests\/testAutofillCreditCardsToggleOnOoff()",
-        "CreditCardsTests\/testCreditCardsAutofill()",
-        "CreditCardsTests\/testErrorStatesCreditCards()",
-        "CreditCardsTests\/testManageCreditCardsOption()",
-        "CreditCardsTests\/testRedirectionToCreditCardsSection()",
-        "CreditCardsTests\/testSaveThisCardPrompt()",
-        "CreditCardsTests\/testUpdatePrompt()",
-        "CreditCardsTests\/testVerifyThatMultipleCardsCanBeAdded()",
-        "CreditCardsTests\/testVerifyThatTheEditedCreditCardIsSaved()",
-        "DataManagementTests",
-        "DatabaseFixtureTest",
-        "DesktopModeTestsIpad",
-        "DesktopModeTestsIphone",
-        "DisplaySettingTests",
-        "DomainAutocompleteTests",
-        "DownloadsTests",
-        "DragAndDropTestIpad",
-        "DragAndDropTests\/testDragAndDropHomeTabTabsTray()",
-        "DragAndDropTests\/testRearrangeMoreThan3TabsTabTray()",
-        "DragAndDropTests\/testRearrangeTabsPrivateModeTabTray()",
-        "DragAndDropTests\/testRearrangeTabsTabTrayLandscape()",
-        "EngagementNotificationTests",
-        "ExperimentIntegrationTests",
-        "FindInPageTests",
-        "FirefoxSuggestTest",
-        "FxScreenGraphTests",
-        "HistoryTests\/testClearHistoryFromSettings()",
-        "HistoryTests\/testClearPrivateDataButtonDisabled()",
-        "HistoryTests\/testClearRecentlyClosedHistory()",
-        "HistoryTests\/testEmptyHistoryListFirstTime()",
-        "HistoryTests\/testLongTapOptionsRecentlyClosedItem()",
-        "HistoryTests\/testOpenInNewPrivateTabRecentlyClosedItem()",
-        "HistoryTests\/testOpenInNewTabRecentlyClosedItem()",
-        "HistoryTests\/testOpenSyncDevices()",
-        "HistoryTests\/testPrivateClosedSiteDoesNotAppearOnRecentlyClosed()",
-        "HistoryTests\/testRecentlyClosedNoWebsiteOpen()",
-        "HistoryTests\/testRecentlyClosedPrivateMode()",
-        "HistoryTests\/testRecentlyClosedWebsiteClosed()",
-        "HistoryTests\/testRecentlyClosedWebsiteOpen()",
-        "HistoryTests\/testRemoveAllTabsButtonRecentlyClosedHistory()",
-        "HomeButtonTests",
-        "HomePageSettingsUITests\/testChangeHomeSettingsLabel()",
-        "HomePageSettingsUITests\/testCheckHomeSettingsByDefault()",
-        "HomePageSettingsUITests\/testClipboard()",
-        "HomePageSettingsUITests\/testDisableTopSitesSettingsRemovesSection()",
-        "HomePageSettingsUITests\/testJumpBackIn()",
-        "HomePageSettingsUITests\/testRecentlySaved()",
-        "HomePageSettingsUITests\/testSetCustomURLAsHome()",
-        "HomePageSettingsUITests\/testSetFirefoxHomeAsHome()",
-        "HomePageSettingsUITests\/testShortcutsRows()",
-        "HomePageSettingsUITests\/testTopSitesCustomNumberOfRows()",
-        "HomePageSettingsUITests\/testTyping()",
-        "InactiveTabsTest",
-        "IntegrationTests",
-        "JumpBackInTests\/testJumpBackInSection()",
-        "JumpBackInTests\/testLongTapOnJumpBackInLink()",
-        "LibraryTestsIpad",
-        "LoginTest",
-        "MicrosurveyTests",
-        "MultiWindowTests",
-        "NavigationTest\/testBackArrowNavigation()",
-        "NavigationTest\/testBookmarkLink()",
-        "NavigationTest\/testCopyLink()",
-        "NavigationTest\/testCopyLinkPrivateMode()",
-        "NavigationTest\/testDownloadLink()",
-        "NavigationTest\/testLongPressLinkOptions()",
-        "NavigationTest\/testLongPressLinkOptionsPrivateMode()",
-        "NavigationTest\/testLongPressOnAddressBar()",
-        "NavigationTest\/testNavigation()",
-        "NavigationTest\/testOpenExternalLink()",
-        "NavigationTest\/testOpenInNewPrivateTab()",
-        "NavigationTest\/testOpenInNewTab()",
-        "NavigationTest\/testPopUpBlocker()",
-        "NavigationTest\/testSSL()",
-        "NavigationTest\/testScrollsToTopWithMultipleTabs()",
-        "NavigationTest\/testShareLink()",
-        "NavigationTest\/testShareLinkPrivateMode()",
-        "NavigationTest\/testTapSignInShowsFxAFromRemoteTabPanel()",
-        "NavigationTest\/testTapSignInShowsFxAFromTour()",
-        "NavigationTest\/testTapSigninShowsFxAFromSettings()",
-        "NavigationTest\/testURLBar()",
-        "NavigationTest\/testVerifyBrowserTabMenu()",
-        "NavigationTest\/testWriteToChildPopupTab()",
-        "NewTabSettingsTest\/testChangeNewTabSettingsLabel()",
-        "NewTabSettingsTest\/testChangeNewTabSettingsShowFirefoxHome()",
-        "NewTabSettingsTest\/testKeyboardRaisedWhenTabOpenedFromTabTray()",
-        "NewTabSettingsTest\/testNewTabCustomURLKeyboardNotRaised()",
-        "NightModeTests",
-        "OnboardingTests\/testCloseOptionToolbarCard()",
-        "OnboardingTests\/testCloseTour()",
-        "OnboardingTests\/testFirstRunTour()",
-        "OnboardingTests\/testFirstRunTourDarkMode()",
-        "OnboardingTests\/testOnboardingSignIn()",
-        "OnboardingTests\/testSelectBottomPlacement()",
-        "OnboardingTests\/testSelectTopPlacement()",
-        "OnboardingTests\/testWhatsNewPage()",
-        "OpeningScreenTests",
-        "PerformanceTests",
-        "PhotonActionSheetTests",
-        "PocketTest",
-        "PocketTests",
-        "PrivateBrowsingTest",
-        "PrivateBrowsingTestIpad",
-        "PrivateBrowsingTestIphone\/testSwitchBetweenPrivateTabsToastButton()",
-        "ReadingListTests",
-        "ReportSiteTests",
-        "ScreenGraphTest",
-        "SearchSettingsUITests",
-        "SearchTests",
-        "SettingsTests\/testAutofillPasswordSettingsOptionSubtitles()",
-        "SettingsTests\/testAutoplayOptionUI()",
-        "SettingsTests\/testBrowsingSettingsOptionSubtitles()",
-        "SettingsTests\/testCopiedLinks()",
-        "SettingsTests\/testHelpOpensSUMOInTab()",
-        "SettingsTests\/testOpenMailAppSettings()",
-        "SettingsTests\/testOpenSiriOption()",
-        "SettingsTests\/testSettingsCrashReportsOption()",
-        "SettingsTests\/testSettingsOptionSubtitles()",
-        "SettingsTests\/testSettingsOptionSubtitlesDarkMode()",
-        "SettingsTests\/testSettingsOptionSubtitlesDarkModeLandscape()",
-        "SettingsTests\/testSettingsOptionSubtitlesLandspace()",
-        "ShareLongPressTests",
-        "ShareMenuTests",
-        "ShareToolbarTests",
-        "SiteLoadTest",
-        "SyncUITests",
-        "TabCounterTests",
-        "TabTrayTests",
-        "TabTrayTests\/testAccessibility()",
-        "TabsPerformanceTest",
-        "TabsTests",
-        "TabsTestsIpad",
-        "TabsTestsIphone",
-        "ThirdPartySearchTest",
-        "TodayWidgetTests",
-        "ToolbarMenuTests",
-        "ToolbarTests",
-        "TrackingProtectionTests",
-        "UrlBarTests",
-        "WhatsNewTest",
-        "ZoomingTests"
-      ],
-      "target" : {
-        "containerPath" : "container:Client.xcodeproj",
-        "identifier" : "3BFE4B061D342FB800DDF53F",
-        "name" : "XCUITests"
-      }
-    }
-  ],
-  "version" : 1
-}
diff --git a/firefox-ios/firefox-ios-tests/Tests/Smoketest4.xctestplan b/firefox-ios/firefox-ios-tests/Tests/Smoketest4.xctestplan
deleted file mode 100644
index b739a55013bcf..0000000000000
--- a/firefox-ios/firefox-ios-tests/Tests/Smoketest4.xctestplan
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "565AB1DC-1E1E-454E-BAC1-C5D12E8F9FA7",
-      "name" : "Configuration 1",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "codeCoverage" : false,
-    "testRepetitionMode" : "retryOnFailure"
-  },
-  "testTargets" : [
-    {
-      "skippedTests" : [
-        "A11yHomePageTests",
-        "A11yHomePageTests\/testA11yHomePageAccessibilityLabels()",
-        "A11yHomePageTests\/testA11yHomePageAudit()",
-        "A11yHomePageTests\/testA11yHomePageVoiceOverNavigation()",
-        "A11yOnboardingTests",
-        "A11yOnboardingTests\/testA11yFirstRunTour()",
-        "A11ySearchTest",
-        "A11ySearchTest\/testA11ySearchSuggestions()",
-        "A11ySettingsTests",
-        "A11ySettingsTests\/testAutofillsAndPasswordAccessibilityReport()",
-        "A11ySettingsTests\/testAutofillsAndPasswordPageAudit()",
-        "A11ySettingsTests\/testDataManagementPageAudit()",
-        "A11ySettingsTests\/testNotificationsAccessibilityReport()",
-        "A11ySettingsTests\/testNotificationsPageAudit()",
-        "A11ySettingsTests\/testSettingAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingAppIconAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingAppIconPageAudit()",
-        "A11ySettingsTests\/testSettingBrowsingAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingBrowsingPageAudit()",
-        "A11ySettingsTests\/testSettingHomePageAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingHomePagePageAudit()",
-        "A11ySettingsTests\/testSettingMainMenuAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingMainMenuExtendedAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingMenuPageAudit()",
-        "A11ySettingsTests\/testSettingNewTabAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingNewTabPageAudit()",
-        "A11ySettingsTests\/testSettingSearchAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSearchPageAudit()",
-        "A11ySettingsTests\/testSettingSiriShortcutAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSiriShortcutPageAudit()",
-        "A11ySettingsTests\/testSettingSyncAndSaveDataAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingSyncAndSaveDataPageAudit()",
-        "A11ySettingsTests\/testSettingThemeAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingThemePageAudit()",
-        "A11ySettingsTests\/testSettingToolbarAccessibilityLabels()",
-        "A11ySettingsTests\/testSettingToolbarPageAudit()",
-        "A11ySettingsTests\/testTrackingProtectionAccessibilityReport()",
-        "A11ySettingsTests\/testTrackingProtectionPageAudit()",
-        "A11yTabTrayTests",
-        "A11yTabTrayTests\/testAccessibility()",
-        "A11yUtils",
-        "ActivityStreamTest\/testContextMenuInLandscape()",
-        "ActivityStreamTest\/testLongTapOnTopSiteOptions()",
-        "ActivityStreamTest\/testShortcutsToggle()",
-        "ActivityStreamTest\/testSiteCanBeAddedToShortcuts()",
-        "ActivityStreamTest\/testTopSites2Add()",
-        "ActivityStreamTest\/testTopSitesRemoveAllExceptDefaultClearPrivateData()",
-        "ActivityStreamTest\/testTopSitesRemoveAllExceptPinnedClearPrivateData()",
-        "ActivityStreamTest\/testTopSitesShiftAfterRemovingOne()",
-        "ActivityStreamTest\/testsiteCanBeAddedToShortcuts()",
-        "AddressesTests\/testAddNewAddressAllFieldsFilled()",
-        "AddressesTests\/testAddNewAddressCityFilled()",
-        "AddressesTests\/testAddNewAddressCountry()",
-        "AddressesTests\/testAddNewAddressEmailFilled()",
-        "AddressesTests\/testAddNewAddressNameFilled()",
-        "AddressesTests\/testAddNewAddressOrganizationFilled()",
-        "AddressesTests\/testAddNewAddressPhoneFilled()",
-        "AddressesTests\/testAddNewAddressPostalCodeFilled()",
-        "AddressesTests\/testAddNewAddressStreetAddressFilled()",
-        "AddressesTests\/testAddressOptionIsAvailableInSettingsMenu()",
-        "AddressesTests\/testAutofillAddressesByTapingAddressField()",
-        "AddressesTests\/testAutofillAddressesByTapingCityField()",
-        "AddressesTests\/testAutofillAddressesByTapingCountryField()",
-        "AddressesTests\/testAutofillAddressesByTapingEmailField()",
-        "AddressesTests\/testAutofillAddressesByTapingNameField()",
-        "AddressesTests\/testAutofillAddressesByTapingOrganizationField()",
-        "AddressesTests\/testAutofillAddressesByTapingPhoneField()",
-        "AddressesTests\/testAutofillAddressesByTapingPostalCodeField()",
-        "AddressesTests\/testAutofillAddressesByTapingStateField()",
-        "AddressesTests\/testAutofillOptionNotAvailableToggleOFF()",
-        "AddressesTests\/testDeleteAddress()",
-        "AddressesTests\/testDeleteAllAddresses()",
-        "AddressesTests\/testToggleAddressOnOff()",
-        "AddressesTests\/testUpdateAddressFieldCity()",
-        "AddressesTests\/testUpdateAddressFieldCountry()",
-        "AddressesTests\/testUpdateAddressFieldEmail()",
-        "AddressesTests\/testUpdateAddressFieldName()",
-        "AddressesTests\/testUpdateAddressFieldOrganization()",
-        "AddressesTests\/testUpdateAddressFieldPhone()",
-        "AddressesTests\/testUpdateAddressFieldStreet()",
-        "AddressesTests\/testUpdateAddressFieldZIP()",
-        "AddressesTests\/testUpdateAllAddressFields()",
-        "AuthenticationTest",
-        "BaseTestCase",
-        "BookmarksTests\/testAccessBookmarksFromContextMenu()",
-        "BookmarksTests\/testAddBookmark()",
-        "BookmarksTests\/testAddNewFolder()",
-        "BookmarksTests\/testAddNewMarker()",
-        "BookmarksTests\/testBookmark()",
-        "BookmarksTests\/testBookmarkingUI()",
-        "BookmarksTests\/testDeleteBookmarkContextMenu()",
-        "BookmarksTests\/testDeleteBookmarkSwiping()",
-        "BookmarksTests\/testEditBookmark()",
-        "BookmarksTests\/testLongTapRecentlySavedLink()",
-        "BookmarksTests\/testRecentlyBookmarked()",
-        "BrowsingPDFTests",
-        "ClipBoardTests",
-        "CreditCardsTests",
-        "DataManagementTests",
-        "DatabaseFixtureTest",
-        "DesktopModeTestsIpad",
-        "DesktopModeTestsIphone",
-        "DisplaySettingTests",
-        "DomainAutocompleteTests",
-        "DownloadsTests",
-        "DragAndDropTestIpad",
-        "DragAndDropTests",
-        "EngagementNotificationTests",
-        "ExperimentIntegrationTests",
-        "FindInPageTests",
-        "FirefoxSuggestTest",
-        "FxScreenGraphTests",
-        "HistoryTests\/testClearHistoryFromSettings()",
-        "HistoryTests\/testClearPrivateData()",
-        "HistoryTests\/testClearRecentHistory()",
-        "HistoryTests\/testClearRecentlyClosedHistory()",
-        "HistoryTests\/testDeleteHistoryEntryBySwiping()",
-        "HistoryTests\/testEmptyHistoryListFirstTime()",
-        "HistoryTests\/testLongTapOptionsRecentlyClosedItem()",
-        "HistoryTests\/testOpenInNewPrivateTabRecentlyClosedItem()",
-        "HistoryTests\/testOpenInNewTabRecentlyClosedItem()",
-        "HistoryTests\/testOpenSyncDevices()",
-        "HistoryTests\/testPrivateClosedSiteDoesNotAppearOnRecentlyClosed()",
-        "HistoryTests\/testRecentlyClosedNoWebsiteOpen()",
-        "HistoryTests\/testRecentlyClosedPrivateMode()",
-        "HistoryTests\/testRecentlyClosedWebsiteClosed()",
-        "HistoryTests\/testRecentlyClosedWebsiteOpen()",
-        "HistoryTests\/testRemoveAllTabsButtonRecentlyClosedHistory()",
-        "HistoryTests\/testTabHistory()",
-        "HomeButtonTests",
-        "HomePageSettingsUITests",
-        "InactiveTabsTest",
-        "IntegrationTests",
-        "IpadOnlyTestCase",
-        "IphoneOnlyTestCase",
-        "JumpBackInTests",
-        "LibraryTestsIpad",
-        "LoginTest\/testAddDuplicateLogin()",
-        "LoginTest\/testCannotSaveLoginWithoutAllFields()",
-        "LoginTest\/testDeleteLogin()",
-        "LoginTest\/testDismissedChangesAreNotSaved()",
-        "LoginTest\/testDoNotSaveLogin()",
-        "LoginTest\/testEditOneLoginEntry()",
-        "LoginTest\/testLoginCopyPaste()",
-        "LoginTest\/testLoginFreshInstallMessage()",
-        "LoginTest\/testLoginsListFromBrowserTabMenu()",
-        "LoginTest\/testSavedLoginSelectUnselect()",
-        "LoginTest\/testSearchLogin()",
-        "LoginTest\/testSearchSavedLoginsByURL()",
-        "LoginTest\/testSearchSavedLoginsByUsername()",
-        "LoginTest\/testVerifyPasswordsSettingMenu()",
-        "LoginTest\/testVerifyUpdatedPasswordIsNotSaved()",
-        "LoginTest\/testVerifyUpdatedPasswordIsSaved()",
-        "MicrosurveyTests",
-        "MultiWindowTests",
-        "NavigationTest\/testBackArrowNavigation()",
-        "NavigationTest\/testBookmarkLink()",
-        "NavigationTest\/testCopyLink()",
-        "NavigationTest\/testCopyLinkPrivateMode()",
-        "NavigationTest\/testDownloadLink()",
-        "NavigationTest\/testLongPressLinkOptionsPrivateMode()",
-        "NavigationTest\/testLongPressOnAddressBar()",
-        "NavigationTest\/testNavigation()",
-        "NavigationTest\/testOpenExternalLink()",
-        "NavigationTest\/testOpenInNewPrivateTab()",
-        "NavigationTest\/testOpenInNewTab()",
-        "NavigationTest\/testScrollsToTopWithMultipleTabs()",
-        "NavigationTest\/testShareLink()",
-        "NavigationTest\/testShareLinkPrivateMode()",
-        "NavigationTest\/testTapSignInShowsFxAFromRemoteTabPanel()",
-        "NavigationTest\/testTapSignInShowsFxAFromTour()",
-        "NavigationTest\/testTapSigninShowsFxAFromSettings()",
-        "NavigationTest\/testWriteToChildPopupTab()",
-        "NewTabSettingsTest",
-        "NightModeTests",
-        "OnboardingTests\/testCloseOptionToolbarCard()",
-        "OnboardingTests\/testCloseTour()",
-        "OnboardingTests\/testFirstRunTour()",
-        "OnboardingTests\/testFirstRunTourDarkMode()",
-        "OnboardingTests\/testOnboardingSignIn()",
-        "OnboardingTests\/testSelectBottomPlacement()",
-        "OnboardingTests\/testSelectTopPlacement()",
-        "OnboardingTests\/testWhatsNewPage()",
-        "OpeningScreenTests",
-        "PerformanceTests",
-        "PhotonActionSheetTests",
-        "PocketTest",
-        "PocketTests",
-        "PrivateBrowsingTest\/testAllPrivateTabsRestore()",
-        "PrivateBrowsingTest\/testClearIndexedDB()",
-        "PrivateBrowsingTest\/testClosePrivateTabsOptionClosesPrivateTabs()",
-        "PrivateBrowsingTest\/testHamburgerMenuNewPrivateTab()",
-        "PrivateBrowsingTest\/testPrivateBrowserPanelView()",
-        "PrivateBrowsingTest\/testPrivateTabDoesNotTrackHistory()",
-        "PrivateBrowsingTest\/testTabCountShowsOnlyNormalOrPrivateTabCount()",
-        "PrivateBrowsingTestIpad",
-        "ReadingListTests",
-        "ReportSiteTests",
-        "ScreenGraphTest",
-        "SearchSettingsUITests",
-        "SearchTests\/testBottomVIewURLBar()",
-        "SearchTests\/testCopyPasteComplete()",
-        "SearchTests\/testDefaultSearchEngine()",
-        "SearchTests\/testDoNotShowSuggestionsWhenEnteringURL()",
-        "SearchTests\/testFirefoxSuggest()",
-        "SearchTests\/testPromptPresence()",
-        "SearchTests\/testSearchIconOnAboutHome()",
-        "SearchTests\/testSearchSuggestions()",
-        "SearchTests\/testSearchWithFirefoxOption()",
-        "SettingsTests",
-        "ShareLongPressTests",
-        "ShareMenuTests",
-        "ShareToolbarTests",
-        "SiteLoadTest",
-        "SyncUITests",
-        "TabCounterTests",
-        "TabTrayTests",
-        "TabTrayTests\/testAccessibility()",
-        "TabsPerformanceTest",
-        "TabsTests",
-        "TabsTestsIpad",
-        "TabsTestsIphone",
-        "ThirdPartySearchTest",
-        "TodayWidgetTests",
-        "ToolbarMenuTests",
-        "ToolbarTests",
-        "TrackingProtectionTests",
-        "URLValidationTests",
-        "UrlBarTests",
-        "WhatsNewTest",
-        "ZoomingTests"
-      ],
-      "target" : {
-        "containerPath" : "container:Client.xcodeproj",
-        "identifier" : "3BFE4B061D342FB800DDF53F",
-        "name" : "XCUITests"
-      }
-    }
-  ],
-  "version" : 1
-}
diff --git a/firefox-ios/firefox-ios-tests/Tests/XCUITests/AddressesTests.swift b/firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift
similarity index 99%
rename from firefox-ios/firefox-ios-tests/Tests/XCUITests/AddressesTests.swift
rename to firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift
index a096e38fc1127..6db4be61e31b3 100644
--- a/firefox-ios/firefox-ios-tests/Tests/XCUITests/AddressesTests.swift
+++ b/firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-class AddressesTests: BaseTestCase {
+class O_AddressesTests: BaseTestCase {
     let addressSavedTxt = "Address Saved"
     let savedAddressesTxt = "SAVED ADDRESSES"
     let removedAddressTxt = "Address Removed"
diff --git a/firefox-ios/firefox-ios-tests/Tests/XCUITests/NewTabSettings.swift b/firefox-ios/firefox-ios-tests/Tests/XCUITests/NewTabSettings.swift
index f63a6d999fe79..4abd026f63a9b 100644
--- a/firefox-ios/firefox-ios-tests/Tests/XCUITests/NewTabSettings.swift
+++ b/firefox-ios/firefox-ios-tests/Tests/XCUITests/NewTabSettings.swift
@@ -155,18 +155,18 @@ class NewTabSettingsTest: BaseTestCase {
         XCTAssertFalse(app.keyboards.element.isVisible(), "The keyboard is shown")
         app.textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField].waitAndTap()
 
-        validateKeyboardIsRaisedAndDismissed()
+        // validateKeyboardIsRaisedAndDismissed()
 
         // Switch to Private Browsing
-        navigator.nowAt(NewTabScreen)
-        navigator.toggleOn(userState.isPrivate, withAction: Action.TogglePrivateMode)
-        navigator.performAction(Action.OpenNewTabFromTabTray)
-        mozWaitForValueContains(url, value: "mozilla")
-        XCTAssertFalse(url.isSelected, "The URL has the focus")
-        XCTAssertFalse(app.keyboards.element.isVisible(), "The keyboard is shown")
-        app.textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField].waitAndTap()
-
-        validateKeyboardIsRaisedAndDismissed()
+//        navigator.nowAt(NewTabScreen)
+//        navigator.toggleOn(userState.isPrivate, withAction: Action.TogglePrivateMode)
+//        navigator.performAction(Action.OpenNewTabFromTabTray)
+//        mozWaitForValueContains(url, value: "mozilla")
+//        XCTAssertFalse(url.isSelected, "The URL has the focus")
+//        XCTAssertFalse(app.keyboards.element.isVisible(), "The keyboard is shown")
+//        app.textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField].waitAndTap()
+
+        // validateKeyboardIsRaisedAndDismissed()
     }
 
     private func validateKeyboardIsRaisedAndDismissed() {


Reviews:
user: login: clarmso
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-04-10T14:48:00Z
user: login: clarmso
state: APPROVED
author_association: COLLABORATOR
submitted_at: 2025-04-10T14:56:29Z
user: login: clarmso
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-04-10T14:57:38Z
user: login: mdotb-moz
body: LGTM
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-04-10T14:57:57Z
user: login: dragosb01
state: APPROVED
author_association: COLLABORATOR
submitted_at: 2025-04-11T03:37:12Z
user: login: isabelrios
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-04-23T14:51:45Z
user: login: dragosb01
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-04-24T05:01:00Z

Review comments:
diff_hunk: @@ -4,7 +4,7 @@
 
 import Foundation
 
-class AddressesTests: BaseTestCase {
+class C_AddressesTests: BaseTestCase {
path: firefox-ios/firefox-ios-tests/Tests/XCUITests/C_AddressesTests.swift
user: login: clarmso
body: Does `AddressesTests` take a long time?
created_at: 2025-04-10T14:48:00Z
author_association: COLLABORATOR
diff_hunk: @@ -78,61 +69,58 @@ workflows:
         run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
     - restore-spm-cache@2.1.1:
         is_always_run: true
+    - xcode-build-for-test@3:
+        inputs:
+        - scheme: Fennec
+        - configuration: Fennec_Testing
+        - project_path: /Users/vagrant/git/firefox-ios/Client.xcodeproj
+        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
     - script@1.2.1:
-        title: Build for Testing
+        title: Override xctestrun file to UnitTests
         inputs:
-        - content: |
+        - content: |-
+            #!/usr/bin/env bash
             set -euxo pipefail
-            echo "-- build-for-testing --"
-            mkdir DerivedData
 
-            xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile
-            xcodebuild "-project" "/Users/vagrant/git/firefox-ios/Client.xcodeproj" "-scheme" "Fennec" -configuration "Fennec_Testing" "CODE_SIGNING_ALLOWED=NO" -sdk "iphonesimulator" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_fennec.log
+            # Point to the Unit tests plan instead of Accessibility
+            UNIT_TESTS_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun"
+            SMOKE_UI_XCTESTRUN="$BITRISE_TEST_BUNDLE_PATH/Fennec_Smoketest_iphonesimulator18.2-arm64.xctestrun"
+
+            if [ ! -f "$UNIT_TESTS_XCTESTRUN" ]; then
+              echo "ERROR: .xctestrun file not found: $UNIT_TESTS_XCTESTRUN"
+              exit 1
+            fi
+
+            echo "Found UnitTest .xctestrun: $UNIT_TESTS_XCTESTRUN"
+            envman add --key BITRISE_XCTESTRUN_UNIT_TEST_FILE_PATH --value "$UNIT_TESTS_XCTESTRUN"
+            envman add --key BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH --value "$SMOKE_UI_XCTESTRUN"
 
-            ls /Users/vagrant/git/DerivedData/Build/Products
-            ls /Users/vagrant/git/DerivedData
     - xcode-test-without-building@0.4.0:
-        run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
         timeout: 1200
         inputs:
         - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2
         - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
-        - xctestrun: "/Users/vagrant/git/DerivedData/Build/Products/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun"
+        - xctestrun: $BITRISE_TEST_BUNDLE_PATH/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun
         - maximum_test_repetitions: 2
-    - save-spm-cache@1.3.1:
+    - xcode-test-shard-calculation@0:
+        inputs:
+        - product_path: $BITRISE_XCTESTRUN_SMOKE_TEST_FILE_PATH
+        - shard_count: 6
path: bitrise.yml
user: login: clarmso
body: Was the `shard_count` determined by experimenting different number to optimize the wait time?
created_at: 2025-04-10T14:57:37Z
author_association: COLLABORATOR
diff_hunk: @@ -155,18 +155,18 @@ class NewTabSettingsTest: BaseTestCase {
         XCTAssertFalse(app.keyboards.element.isVisible(), "The keyboard is shown")
         app.textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField].waitAndTap()
 
-        validateKeyboardIsRaisedAndDismissed()
+        // validateKeyboardIsRaisedAndDismissed()
path: firefox-ios/firefox-ios-tests/Tests/XCUITests/NewTabSettings.swift
user: login: isabelrios
body: @dragosb01  I am commenting this part of the test since it is failing in Bitrise. I would like to investigate it but not block the PR because of this if that is fine with you. 
I can also update the test rail test with this info while it is fixed
created_at: 2025-04-23T14:51:45Z
author_association: CONTRIBUTOR
diff_hunk: @@ -155,18 +155,18 @@ class NewTabSettingsTest: BaseTestCase {
         XCTAssertFalse(app.keyboards.element.isVisible(), "The keyboard is shown")
         app.textFields[AccessibilityIdentifiers.Browser.AddressToolbar.searchTextField].waitAndTap()
 
-        validateKeyboardIsRaisedAndDismissed()
+        // validateKeyboardIsRaisedAndDismissed()
path: firefox-ios/firefox-ios-tests/Tests/XCUITests/NewTabSettings.swift
user: login: dragosb01
body: thats fine with me
created_at: 2025-04-24T05:01:00Z
author_association: COLLABORATOR

PR comments:
user: login: mobiletest-ci-bot
created_at: 2025-03-31T14:49:03Z
body: 
<!--
  0 failure: 
  1 warning:  This Pull Request...
  2 messages
  
  DangerID: danger-id-Danger;
-->


<table>
  <thead>
    <tr>
      <th width="50"></th>
      <th width="100%" data-danger-table="true">Warnings</th>
    </tr>
  </thead>
  <tbody><tr>
      <td>:warning:</td>
      <td>This Pull Request seems quite large. If it consists of multiple changes, try splitting them into separate PRs for a faster review process. Consider using epic branches for work impacting main.</td>
    </tr>
  </tbody>
</table>


<table>
  <thead>
    <tr>
      <th width="50"></th>
      <th width="100%" data-danger-table="true">Messages</th>
    </tr>
  </thead>
  <tbody><tr>
      <td>:book:</td>
      <td>Edited 6 files</td>
    </tr>
  
<tr>
      <td>:book:</td>
      <td>Created 0 files</td>
    </tr>
  </tbody>
</table>


<p align="right">
  Generated by :no_entry_sign: <a href="https://danger.systems/swift">Danger Swift</a> against 67f0c7d073106c98bfb3dfdd836bb0dde6facf55
</p>

author_association: NONE
user: login: mergify[bot]
created_at: 2025-04-02T07:23:15Z
body: This pull request has conflicts when rebasing. Could you fix it @isabelrios? 🙏
author_association: CONTRIBUTOR
user: login: isabelrios
created_at: 2025-04-07T12:26:51Z
body: This is the new dependencies build graph
![imagen](https://github.com/user-attachments/assets/0541ffa7-632d-44b1-960b-a637e53e1d36)

And how to see the results for smoketest, going to the bitrise general check (example of how the different UI Test run reports are shown even though in that build they did not run:
![imagen](https://github.com/user-attachments/assets/2ff45187-1a13-40db-8bf7-e2d91986073d)

author_association: CONTRIBUTOR
user: login: mergify[bot]
created_at: 2025-04-08T14:40:47Z
body: This pull request has conflicts when rebasing. Could you fix it @isabelrios? 🙏
author_association: CONTRIBUTOR
user: login: mergify[bot]
created_at: 2025-04-21T12:21:14Z
body: This pull request has conflicts when rebasing. Could you fix it @isabelrios? 🙏
author_association: CONTRIBUTOR
user: login: mergify[bot]
created_at: 2025-04-23T07:31:49Z
body: This pull request has conflicts when rebasing. Could you fix it @isabelrios? 🙏
author_association: CONTRIBUTOR