diff --git a/UITests/Sources/AppLockSetupTests.swift b/UITests/Sources/AppLockSetupTests.swift
index c4aa6fde4..5ee237285 100644
--- a/UITests/Sources/AppLockSetupTests.swift
+++ b/UITests/Sources/AppLockSetupTests.swift
@@ -13,16 +13,9 @@ class AppLockSetupUITests: XCTestCase {
     var app: XCUIApplication!
     
     @MainActor enum Step {
-        static let createPIN = 0
-        static let confirmPIN = 1
         static let setupBiometrics = 2
         static let settings = 3
-        
-        /// iPad shows the settings screen behind the modal, iPhone doesn't.
-        static let changePIN = isPhone ? createPIN : 4
-        /// iPad shows the settings screen behind the modal, iPhone doesn't.
-        static let confirmChangePIN = isPhone ? confirmPIN : 5
-        
+                
         /// Not part of the flow, only to verify the stack is cleared.
         static let clearedStack = 99
         
@@ -31,20 +24,16 @@ class AppLockSetupUITests: XCTestCase {
         }
     }
     
-    func disabled_testCreateFlow() async throws {
+    func testCreateFlow() async throws {
         app = Application.launch(.appLockSetupFlow)
         
         // Wait for the keyboard to push the sheet up before snapshotting
         try await Task.sleep(for: .seconds(0.5))
         
         // Create PIN screen.
-        try await app.assertScreenshot(step: Step.createPIN)
-        
         enterPIN()
         
         // Confirm PIN screen.
-        try await app.assertScreenshot(step: Step.confirmPIN)
-        
         enterPIN()
         
         // Setup biometrics screen.
@@ -58,13 +47,9 @@ class AppLockSetupUITests: XCTestCase {
         app.buttons[A11yIdentifiers.appLockSetupSettingsScreen.changePIN].tap()
         
         // Change PIN (create).
-        try await app.assertScreenshot(step: Step.changePIN)
-        
         enterDifferentPIN()
         
         // Change PIN (confirm).
-        try await app.assertScreenshot(step: Step.confirmChangePIN)
-        
         enterDifferentPIN()
         
         // Settings screen.
@@ -81,13 +66,9 @@ class AppLockSetupUITests: XCTestCase {
         app = Application.launch(.appLockSetupFlowMandatory)
         
         // Create PIN screen (non-modal and no cancellation button).
-        try await app.assertScreenshot(step: Step.createPIN)
-        
         enterPIN()
         
         // Confirm PIN screen (non-modal and no cancellation button).
-        try await app.assertScreenshot(step: Step.confirmPIN)
-        
         enterPIN()
         
         // Setup biometrics screen (non-modal).
@@ -101,12 +82,10 @@ class AppLockSetupUITests: XCTestCase {
         try await app.assertScreenshot(step: Step.setupBiometrics)
     }
     
-    func disabled_testUnlockFlow() async throws {
+    func testUnlockFlow() async throws {
         app = Application.launch(.appLockSetupFlowUnlock)
         
         // Create PIN screen.
-        try await app.assertScreenshot()
-        
         enterPIN()
         
         // Settings screen.
@@ -119,14 +98,10 @@ class AppLockSetupUITests: XCTestCase {
         try await app.assertScreenshot(step: Step.clearedStack)
     }
     
-    func disabled_testCancel() async throws {
+    func testCancel() async throws {
         app = Application.launch(.appLockSetupFlowUnlock)
         
-        app.showKeyboardIfNeeded() // The secure text field is focussed automatically
-        
         // Create PIN screen.
-        try await app.assertScreenshot()
-        
         app.buttons[A11yIdentifiers.appLockSetupPINScreen.cancel].tap()
         
         // Return to whatever was last presented.
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-en-GB.png
deleted file mode 100644
index 958db93f2..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f08ddfb99318479d17d7e593705dc6d7c4eaa394b09461df94d0f82df15976f5
-size 148620
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-en-GB.png
deleted file mode 100644
index 8dbfe9746..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:139152b701bc553f70ee50c3b1ba37d5bc329c926ca74cc9c9e32352cf253d60
-size 97672
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-0.png
deleted file mode 100644
index 40d170505..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d32f8380c8bea0bc6d563d76f0c78cabd1f9886da8c1a33580333d8e104d4c54
-size 160119
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-1.png
deleted file mode 100644
index 2fa23fa07..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c57a84f71dcdc548b2f45c5986fb15f810a0aad84c3268cf58e873319a10453
-size 159700
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-4.png
deleted file mode 100644
index 63ab71190..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a44ebe8b40cfdff788857acf497e1055c88480b1629c1ed716c8532dcad5a312
-size 180542
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-5.png
deleted file mode 100644
index 13c6b13fe..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-en-GB-5.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de5fc0d78df2d5a60f2f7bfc12ce86789d2b12736be1439db83ce4d7e15d6598
-size 180188
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-en-GB-0.png
deleted file mode 100644
index 95140dbba..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6d0ee1f8ca41b2c12fdd1ce304fbc3813f27310d9f9857d2098b08bdbddaf45
-size 113262
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-en-GB-1.png
deleted file mode 100644
index 2189863bf..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac93a3a3e8c8e91dec1e0147c60018a49f3b75bfca5fc20c0fc640acb339656f
-size 112956
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-en-GB-0.png
deleted file mode 100644
index d0bf14bcf..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53bb40cef3abba21a75532115603eb338251b9a6a8437c3118c617c7714c503c
-size 90138
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-en-GB-1.png
deleted file mode 100644
index 2d5ab314d..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e43242709b27c637acf9de7bdfed193cff787947fcbae64ced66ee8dff35b51
-size 89751
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-en-GB-0.png
deleted file mode 100644
index 94fab79cb..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa0633a0de8988b6b55e80192b77b9e29cac43a7651387d700a494fce05ebc47
-size 96074
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-en-GB-1.png
deleted file mode 100644
index 615023a89..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c172d4a729e4c4e63102be70ec7568c89d00716e3f4b4efba4a9382cb87c9f57
-size 95723
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-en-GB.png
deleted file mode 100644
index 958db93f2..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f08ddfb99318479d17d7e593705dc6d7c4eaa394b09461df94d0f82df15976f5
-size 148620
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB.png
deleted file mode 100644
index 8dbfe9746..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:139152b701bc553f70ee50c3b1ba37d5bc329c926ca74cc9c9e32352cf253d60
-size 97672