diff --git a/UITests/Sources/RoomDetailsScreenUITests.swift b/UITests/Sources/RoomDetailsScreenUITests.swift
index 1665d8ea3..43450d5f6 100644
--- a/UITests/Sources/RoomDetailsScreenUITests.swift
+++ b/UITests/Sources/RoomDetailsScreenUITests.swift
@@ -30,7 +30,7 @@ class RoomDetailsScreenUITests: XCTestCase {
     func testInitialStateComponentsWithRoomAvatar() async throws {
         let app = Application.launch(.roomDetailsScreenWithRoomAvatar)
 
-        XCTAssert(app.images[A11yIdentifiers.roomDetailsScreen.avatar].waitForExistence(timeout: 1))
+        XCTAssert(app.buttons[A11yIdentifiers.roomDetailsScreen.avatar].waitForExistence(timeout: 1))
         XCTAssert(app.buttons[A11yIdentifiers.roomDetailsScreen.people].waitForExistence(timeout: 1))
         try await app.assertScreenshot(.roomDetailsScreenWithRoomAvatar)
     }
@@ -52,7 +52,7 @@ class RoomDetailsScreenUITests: XCTestCase {
     func testInitialStateComponentsDmDetails() async throws {
         let app = Application.launch(.roomDetailsScreenDmDetails)
 
-        XCTAssert(app.images[A11yIdentifiers.roomDetailsScreen.dmAvatar].waitForExistence(timeout: 1))
+        XCTAssert(app.buttons[A11yIdentifiers.roomDetailsScreen.dmAvatar].waitForExistence(timeout: 1))
         XCTAssertFalse(app.buttons[A11yIdentifiers.roomDetailsScreen.people].exists)
         try await app.assertScreenshot(.roomDetailsScreenDmDetails)
     }
diff --git a/UITests/Sources/RoomScreenUITests.swift b/UITests/Sources/RoomScreenUITests.swift
index 8ac7b5e93..70a2dd902 100644
--- a/UITests/Sources/RoomScreenUITests.swift
+++ b/UITests/Sources/RoomScreenUITests.swift
@@ -75,7 +75,7 @@ class RoomScreenUITests: XCTestCase {
         try await app.assertScreenshot(.roomSmallTimelineLargePagination)
     }
 
-    func testTimelineLayoutInMiddle() async throws {
+    func disabled_testTimelineLayoutInMiddle() async throws {
         let client = try UITestsSignalling.Client(mode: .tests)
         
         let app = Application.launch(.roomLayoutMiddle)
@@ -100,8 +100,7 @@ class RoomScreenUITests: XCTestCase {
         
         // Then the UI should still remain unchanged.
 
-        // FIXME: the timeline scrolls a bit on new incoming messages
-        // try await app.assertScreenshot(.roomLayoutMiddle, step: 0)
+        try await app.assertScreenshot(.roomLayoutMiddle, step: 0)
         
         // When the keyboard appears for the message composer.
         try await tapMessageComposer(in: app)