diff --git a/axe-devtools-ios-sample-appUITests/AutoScan/AutoScanUITests.swift b/axe-devtools-ios-sample-appUITests/AutoScan/AutoScanUITests.swift
index 04d69c6..46f493b 100644
--- a/axe-devtools-ios-sample-appUITests/AutoScan/AutoScanUITests.swift
+++ b/axe-devtools-ios-sample-appUITests/AutoScan/AutoScanUITests.swift
@@ -39,15 +39,15 @@ final class AutoScanUITests: XCTestCase {
         app.otherElements.matching(identifier: "Horizontal scroll bar, 1 page").element(boundBy: 0).swipeUp()
 
         // Catalog — browse the categories.
-        app.images["Category"].firstMatch.tap()
+        app.goToTab("Catalog")
         app.scrollViews.firstMatch.swipeUp()
 
         // Cart — add an item.
-        app.images["Bag"].firstMatch.tap()
+        app.goToTab("Cart")
         app.buttons.matching(identifier: "+").element(boundBy: 1).tap()
 
         // Profile — open and scroll to the help section.
-        app.images["Menu"].firstMatch.tap()
+        app.goToTab("Profile")
         app.cells.containing(.image, identifier: "Info Square").firstMatch.swipeUp()
     }
 }
diff --git a/axe-devtools-ios-sample-appUITests/TargetedScan/TargetedScanUITests.swift b/axe-devtools-ios-sample-appUITests/TargetedScan/TargetedScanUITests.swift
index dadb40c..fef544b 100644
--- a/axe-devtools-ios-sample-appUITests/TargetedScan/TargetedScanUITests.swift
+++ b/axe-devtools-ios-sample-appUITests/TargetedScan/TargetedScanUITests.swift
@@ -58,7 +58,7 @@ final class TargetedScanUITests: XCTestCase {
     }
 
     /// Scans a couple of screens and uploads each result to DevHub, showing the
-    /// common reporting options: a custom scan name and tags.
+    /// common reporting option: a custom scan name.
     func testScanAndUploadToDevHub() throws {
         let axe = try XCTUnwrap(axe, "axe DevTools didn't start — did you add your API key to Login.swift?")
 
@@ -66,8 +66,7 @@ final class TargetedScanUITests: XCTestCase {
         try axe.postResult(try axe.run(onElement: app), withScanName: "Home Tab")
 
         app.goToTab("Catalog")
-        // Tags make a scan easy to find and share on DevHub.
-        try axe.postResult(try axe.run(onElement: app), withTags: ["smoke", "catalog"], withScanName: "Catalog Tab")
+        try axe.postResult(try axe.run(onElement: app), withScanName: "Catalog Tab")
     }
 
     /// Demonstrates gating a build on accessibility: fail if any CRITICAL issues are found.