diff --git a/RiotSwiftUI/Modules/Room/PollHistory/Test/UI/PollHistoryUITests.swift b/RiotSwiftUI/Modules/Room/PollHistory/Test/UI/PollHistoryUITests.swift
index 3fcc05c7b..5867b88e8 100644
--- a/RiotSwiftUI/Modules/Room/PollHistory/Test/UI/PollHistoryUITests.swift
+++ b/RiotSwiftUI/Modules/Room/PollHistory/Test/UI/PollHistoryUITests.swift
@@ -18,29 +18,51 @@ import RiotSwiftUI
 import XCTest
 
 class PollHistoryUITests: MockScreenTestCase {
-    func testPollHistoryHasContent() {
+    func testActivePollHistoryHasContent() {
         app.goToScreenWithIdentifier(MockPollHistoryScreenState.active.title)
         let title = app.navigationBars.firstMatch.identifier
         let emptyText = app.staticTexts["PollHistory.emptyText"]
         let items = app.staticTexts["PollListItem.title"]
         let selectedSegment = app.buttons[VectorL10n.pollHistoryActiveSegmentTitle]
+        let winningOption = app.staticTexts["PollListData.winningOption"]
+        
         XCTAssertEqual(title, VectorL10n.pollHistoryTitle)
         XCTAssertTrue(items.exists)
         XCTAssertFalse(emptyText.exists)
         XCTAssertTrue(selectedSegment.exists)
         XCTAssertEqual(selectedSegment.value as? String, VectorL10n.accessibilitySelected)
+        XCTAssertFalse(winningOption.exists)
     }
     
-    func testPollHistoryShowsEmptyScreen() {
+    func testPastPollHistoryHasContent() {
+        app.goToScreenWithIdentifier(MockPollHistoryScreenState.past.title)
+        let title = app.navigationBars.firstMatch.identifier
+        let emptyText = app.staticTexts["PollHistory.emptyText"]
+        let items = app.staticTexts["PollListItem.title"]
+        let selectedSegment = app.buttons[VectorL10n.pollHistoryPastSegmentTitle]
+        let winningOption = app.staticTexts["PollListData.winningOption"]
+        
+        XCTAssertEqual(title, VectorL10n.pollHistoryTitle)
+        XCTAssertTrue(items.exists)
+        XCTAssertFalse(emptyText.exists)
+        XCTAssertTrue(selectedSegment.exists)
+        XCTAssertEqual(selectedSegment.value as? String, VectorL10n.accessibilitySelected)
+        XCTAssertTrue(winningOption.exists)
+    }
+    
+    func testPastPollHistoryIsEmpty() {
         app.goToScreenWithIdentifier(MockPollHistoryScreenState.pastEmpty.title)
         let title = app.navigationBars.firstMatch.identifier
         let emptyText = app.staticTexts["PollHistory.emptyText"]
         let items = app.staticTexts["PollListItem.title"]
         let selectedSegment = app.buttons[VectorL10n.pollHistoryPastSegmentTitle]
+        let winningOption = app.staticTexts["PollListData.winningOption"]
+        
         XCTAssertEqual(title, VectorL10n.pollHistoryTitle)
         XCTAssertFalse(items.exists)
         XCTAssertTrue(emptyText.exists)
         XCTAssertTrue(selectedSegment.exists)
         XCTAssertEqual(selectedSegment.value as? String, VectorL10n.accessibilitySelected)
+        XCTAssertFalse(winningOption.exists)
     }
 }
diff --git a/RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift b/RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift
index cd9001a56..7cf9bb45a 100644
--- a/RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift
+++ b/RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift
@@ -45,7 +45,7 @@ struct PollHistory: View {
         .onAppear {
             viewModel.send(viewAction: .viewAppeared)
         }
-        .onChange(of: viewModel.mode) { newValue in
+        .onChange(of: viewModel.mode) { _ in
             viewModel.send(viewAction: .segmentDidChange)
         }
     }
diff --git a/RiotSwiftUI/Modules/Room/PollHistory/View/PollListItem.swift b/RiotSwiftUI/Modules/Room/PollHistory/View/PollListItem.swift
index c2447fa1e..b810f098f 100644
--- a/RiotSwiftUI/Modules/Room/PollHistory/View/PollListItem.swift
+++ b/RiotSwiftUI/Modules/Room/PollHistory/View/PollListItem.swift
@@ -70,6 +70,7 @@ struct PollListItem: View {
                 Text(pollData.winningOption!.text)
                     .font(theme.fonts.body)
                     .foregroundColor(theme.colors.primaryContent)
+                    .accessibilityLabel("PollListData.winningOption")
                 
                 Spacer()