diff --git a/ElementX/Sources/Services/Media/Provider/MediaSourceProxy.swift b/ElementX/Sources/Services/Media/Provider/MediaSourceProxy.swift
index 6c4e8a165..5872751ad 100644
--- a/ElementX/Sources/Services/Media/Provider/MediaSourceProxy.swift
+++ b/ElementX/Sources/Services/Media/Provider/MediaSourceProxy.swift
@@ -9,7 +9,7 @@
 import Foundation
 @preconcurrency import MatrixRustSDK
 
-struct MediaSourceProxy: Hashable, Sendable {
+struct MediaSourceProxy: Hashable {
     /// The media source provided by Rust.
     let underlyingSource: MediaSource
     /// The media's mime type, used when loading the media's file.
diff --git a/ElementX/Sources/Services/Timeline/TimelineItemIdentifier.swift b/ElementX/Sources/Services/Timeline/TimelineItemIdentifier.swift
index f0c2b1723..328eb23c7 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItemIdentifier.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItemIdentifier.swift
@@ -14,7 +14,7 @@ import Foundation
 /// Its value is consistent only per timeline instance, it should **not** be used to identify an item across timeline instances.
 /// - eventOrTransactionID: Contains the 2 possible identifiers of an event, either it has a remote event id or
 /// a local transaction id, never both or none.
-enum TimelineItemIdentifier: Hashable, Sendable {
+enum TimelineItemIdentifier: Hashable {
     struct UniqueID: Hashable {
         let value: String
         
diff --git a/PreviewTests/Sources/PreviewTests.swift b/PreviewTests/Sources/PreviewTests.swift
index 9e524b926..6817cbff5 100644
--- a/PreviewTests/Sources/PreviewTests.swift
+++ b/PreviewTests/Sources/PreviewTests.swift
@@ -12,7 +12,6 @@ import Combine
 import SwiftUI
 import Testing
 
-@Suite
 @MainActor
 struct PreviewTests {
     private struct SnapshotDevice {
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateScreenViewModelTests.swift b/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateScreenViewModelTests.swift
index 7d08906dc..fcb3fb80c 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateScreenViewModelTests.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateScreenViewModelTests.swift
@@ -8,7 +8,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 @MainActor
 struct TemplateScreenViewModelTests {
     var viewModel: TemplateScreenViewModelProtocol
diff --git a/UnitTests/Sources/AVMetadataMachineReadableCodeObjectExtensionsTest.swift b/UnitTests/Sources/AVMetadataMachineReadableCodeObjectExtensionsTest.swift
index 69a261d10..aee40a164 100644
--- a/UnitTests/Sources/AVMetadataMachineReadableCodeObjectExtensionsTest.swift
+++ b/UnitTests/Sources/AVMetadataMachineReadableCodeObjectExtensionsTest.swift
@@ -10,7 +10,6 @@ import AVKit
 @testable import ElementX
 import Testing
 
-@Suite
 struct AVMetadataMachineReadableCodeObjectExtensionsTest {
     @Test
     func decodeQRCodeVersion8() throws {
diff --git a/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift b/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift
index 9c3cc662c..054e8c371 100644
--- a/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/AnalyticsSettingsScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 final class AnalyticsSettingsScreenViewModelTests {
     private var appSettings: AppSettings!
     private var viewModel: AnalyticsSettingsScreenViewModelProtocol!
diff --git a/UnitTests/Sources/AnalyticsTests.swift b/UnitTests/Sources/AnalyticsTests.swift
index 92c477bf4..b6f820abc 100644
--- a/UnitTests/Sources/AnalyticsTests.swift
+++ b/UnitTests/Sources/AnalyticsTests.swift
@@ -11,7 +11,6 @@ import AnalyticsEvents
 import PostHog
 import Testing
 
-@Suite
 final class AnalyticsTests {
     private var appSettings: AppSettings
     private var analyticsClient: AnalyticsClientMock
diff --git a/UnitTests/Sources/AppLock/AppLockScreenViewModelTests.swift b/UnitTests/Sources/AppLock/AppLockScreenViewModelTests.swift
index 92fcc9f05..e5a4a143d 100644
--- a/UnitTests/Sources/AppLock/AppLockScreenViewModelTests.swift
+++ b/UnitTests/Sources/AppLock/AppLockScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 final class AppLockScreenViewModelTests {
     var appSettings: AppSettings
     var appLockService: AppLockService
diff --git a/UnitTests/Sources/AppLock/AppLockServiceTests.swift b/UnitTests/Sources/AppLock/AppLockServiceTests.swift
index 835590496..628e7255c 100644
--- a/UnitTests/Sources/AppLock/AppLockServiceTests.swift
+++ b/UnitTests/Sources/AppLock/AppLockServiceTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 final class AppLockServiceTests {
     private var keychainController: KeychainController
     private var appSettings: AppSettings
diff --git a/UnitTests/Sources/AppLock/AppLockSettingsScreenViewModelTests.swift b/UnitTests/Sources/AppLock/AppLockSettingsScreenViewModelTests.swift
index 65366c359..69169ec54 100644
--- a/UnitTests/Sources/AppLock/AppLockSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/AppLock/AppLockSettingsScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct AppLockSetupSettingsScreenViewModelTests {
     var appLockService: AppLockServiceProtocol
     var keychainController: KeychainControllerMock
diff --git a/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift b/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift
index 8900c371b..2d2d815e5 100644
--- a/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift
+++ b/UnitTests/Sources/AppLock/AppLockSetupBiometricsScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 final class AppLockSetupBiometricsScreenViewModelTests {
     var appLockService: AppLockServiceMock
     var viewModel: AppLockSetupBiometricsScreenViewModelProtocol
diff --git a/UnitTests/Sources/AppLock/AppLockSetupPINScreenViewModelTests.swift b/UnitTests/Sources/AppLock/AppLockSetupPINScreenViewModelTests.swift
index f681bc46e..d7e650668 100644
--- a/UnitTests/Sources/AppLock/AppLockSetupPINScreenViewModelTests.swift
+++ b/UnitTests/Sources/AppLock/AppLockSetupPINScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 final class AppLockSetupPINScreenViewModelTests {
     var appLockService: AppLockService!
     var keychainController: KeychainControllerMock!
diff --git a/UnitTests/Sources/AppLock/AppLockTimerTests.swift b/UnitTests/Sources/AppLock/AppLockTimerTests.swift
index 675b915dc..081c67858 100644
--- a/UnitTests/Sources/AppLock/AppLockTimerTests.swift
+++ b/UnitTests/Sources/AppLock/AppLockTimerTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct AppLockTimerTests {
     private let now = Date.now
     private var timer: AppLockTimer!
diff --git a/UnitTests/Sources/AppLock/PINTextFieldTests.swift b/UnitTests/Sources/AppLock/PINTextFieldTests.swift
index 9c9393229..b57305a70 100644
--- a/UnitTests/Sources/AppLock/PINTextFieldTests.swift
+++ b/UnitTests/Sources/AppLock/PINTextFieldTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 struct PINTextFieldTests {
     @Test
     func sanitize() {
diff --git a/UnitTests/Sources/AppRouteURLParserTests.swift b/UnitTests/Sources/AppRouteURLParserTests.swift
index 03762b868..95cf3ac4f 100644
--- a/UnitTests/Sources/AppRouteURLParserTests.swift
+++ b/UnitTests/Sources/AppRouteURLParserTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct AppRouteURLParserTests {
     var appSettings: AppSettings
     var appRouteURLParser: AppRouteURLParser
diff --git a/UnitTests/Sources/ArrayTests.swift b/UnitTests/Sources/ArrayTests.swift
index ec02d6076..6d3d825ff 100644
--- a/UnitTests/Sources/ArrayTests.swift
+++ b/UnitTests/Sources/ArrayTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct ArrayTests {
     @Test
     func grouping() {
diff --git a/UnitTests/Sources/AttributedStringBuilderTests.swift b/UnitTests/Sources/AttributedStringBuilderTests.swift
index bd1a3c340..9a59782d9 100644
--- a/UnitTests/Sources/AttributedStringBuilderTests.swift
+++ b/UnitTests/Sources/AttributedStringBuilderTests.swift
@@ -10,7 +10,6 @@
 import SwiftUI
 import Testing
 
-@Suite
 struct AttributedStringBuilderTests {
     private let attributedStringBuilder: AttributedStringBuilder
     private let maxHeaderPointSize = ceil(UIFont.preferredFont(forTextStyle: .body).pointSize * 1.2)
diff --git a/UnitTests/Sources/AttributedStringTests.swift b/UnitTests/Sources/AttributedStringTests.swift
index d6fa9765e..454840cdb 100644
--- a/UnitTests/Sources/AttributedStringTests.swift
+++ b/UnitTests/Sources/AttributedStringTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 struct AttributedStringTests {
     @Test
     func replacingFontWithPresentationIntent() throws {
diff --git a/UnitTests/Sources/AudioPlayerStateTests.swift b/UnitTests/Sources/AudioPlayerStateTests.swift
index aec269900..6db739593 100644
--- a/UnitTests/Sources/AudioPlayerStateTests.swift
+++ b/UnitTests/Sources/AudioPlayerStateTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct AudioPlayerStateTests {
     static let audioDuration = 10.0
     private var audioPlayerState: AudioPlayerState!
diff --git a/UnitTests/Sources/AudioRecorderStateTests.swift b/UnitTests/Sources/AudioRecorderStateTests.swift
index 5d321d15b..4f83050d4 100644
--- a/UnitTests/Sources/AudioRecorderStateTests.swift
+++ b/UnitTests/Sources/AudioRecorderStateTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct AudioRecorderStateTests {
     private var audioRecorderState: AudioRecorderState!
     private var audioRecorderMock: AudioRecorderMock!
diff --git a/UnitTests/Sources/AudioRecorderTests.swift b/UnitTests/Sources/AudioRecorderTests.swift
index ad5e42051..025e408fc 100644
--- a/UnitTests/Sources/AudioRecorderTests.swift
+++ b/UnitTests/Sources/AudioRecorderTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct AudioRecorderTests {
     private var audioRecorder: AudioRecorder!
     private var audioSessionMock: AudioSessionMock!
diff --git a/UnitTests/Sources/AuthenticationServiceTests.swift b/UnitTests/Sources/AuthenticationServiceTests.swift
index 9709fdc6c..a9c2d475e 100644
--- a/UnitTests/Sources/AuthenticationServiceTests.swift
+++ b/UnitTests/Sources/AuthenticationServiceTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 @MainActor
 struct AuthenticationServiceTests {
     var client: ClientSDKMock!
diff --git a/UnitTests/Sources/AuthenticationStartScreenViewModelTests.swift b/UnitTests/Sources/AuthenticationStartScreenViewModelTests.swift
index 9a8daf5af..5147f699a 100644
--- a/UnitTests/Sources/AuthenticationStartScreenViewModelTests.swift
+++ b/UnitTests/Sources/AuthenticationStartScreenViewModelTests.swift
@@ -12,7 +12,6 @@ import Testing
 import UIKit
 
 @MainActor
-@Suite
 final class AuthenticationStartScreenViewModelTests {
     var clientFactory: AuthenticationClientFactoryMock!
     var client: ClientSDKMock!
diff --git a/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift b/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift
index fb5fdf336..b411a4747 100644
--- a/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift
+++ b/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct BlockedUsersScreenViewModelTests {
     @Test
     func initialState() async throws {
diff --git a/UnitTests/Sources/BugReportScreenViewModelTests.swift b/UnitTests/Sources/BugReportScreenViewModelTests.swift
index 2c876c65c..ad0a3e008 100644
--- a/UnitTests/Sources/BugReportScreenViewModelTests.swift
+++ b/UnitTests/Sources/BugReportScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Testing
 import UIKit
 
 @MainActor
-@Suite
 struct BugReportScreenViewModelTests {
     let logFiles: [URL] = [URL(filePath: "/path/to/file1.log"), URL(filePath: "/path/to/file2.log")]
     
diff --git a/UnitTests/Sources/BugReportServiceTests.swift b/UnitTests/Sources/BugReportServiceTests.swift
index 8f1d2f66d..cba5c0988 100644
--- a/UnitTests/Sources/BugReportServiceTests.swift
+++ b/UnitTests/Sources/BugReportServiceTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Foundation
 import Testing
 
-@Suite
 final class BugReportServiceTests {
     var appSettings: AppSettings!
     var bugReportService: BugReportServiceProtocol!
diff --git a/UnitTests/Sources/ChatsTabFlowCoordinatorTests.swift b/UnitTests/Sources/ChatsTabFlowCoordinatorTests.swift
index 22bb8eefe..55aa72776 100644
--- a/UnitTests/Sources/ChatsTabFlowCoordinatorTests.swift
+++ b/UnitTests/Sources/ChatsTabFlowCoordinatorTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Foundation
 import Testing
 
-@Suite
 @MainActor
 struct ChatsTabFlowCoordinatorTests {
     var clientProxy: ClientProxyMock!
diff --git a/UnitTests/Sources/CompletionSuggestionServiceTests.swift b/UnitTests/Sources/CompletionSuggestionServiceTests.swift
index 64f7ef0e0..96c7c35c2 100644
--- a/UnitTests/Sources/CompletionSuggestionServiceTests.swift
+++ b/UnitTests/Sources/CompletionSuggestionServiceTests.swift
@@ -10,7 +10,6 @@ import Combine
 @testable import ElementX
 import Testing
 
-@Suite
 @MainActor
 struct CompletionSuggestionServiceTests {
     @Test
diff --git a/UnitTests/Sources/ComposerToolbarViewModelTests.swift b/UnitTests/Sources/ComposerToolbarViewModelTests.swift
index 3175c9b6b..001f275c3 100644
--- a/UnitTests/Sources/ComposerToolbarViewModelTests.swift
+++ b/UnitTests/Sources/ComposerToolbarViewModelTests.swift
@@ -13,7 +13,6 @@ import MatrixRustSDK
 import Testing
 import WysiwygComposer
 
-@Suite
 @MainActor
 final class ComposerToolbarViewModelTests {
     private var appSettings: AppSettings!
diff --git a/UnitTests/Sources/CreateRoomViewModelTests.swift b/UnitTests/Sources/CreateRoomViewModelTests.swift
index 4ddfa6cdf..97332a717 100644
--- a/UnitTests/Sources/CreateRoomViewModelTests.swift
+++ b/UnitTests/Sources/CreateRoomViewModelTests.swift
@@ -10,7 +10,6 @@ import Combine
 @testable import ElementX
 import Testing
 
-@Suite
 @MainActor
 final class CreateRoomScreenViewModelTests {
     var viewModel: CreateRoomScreenViewModelProtocol!
diff --git a/UnitTests/Sources/DateTests.swift b/UnitTests/Sources/DateTests.swift
index 0eaa2ba3c..6b4debaef 100644
--- a/UnitTests/Sources/DateTests.swift
+++ b/UnitTests/Sources/DateTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct DateTests {
     let calendar = Calendar.current
     var startOfToday: Date {
diff --git a/UnitTests/Sources/DeactivateAccountScreenViewModelTests.swift b/UnitTests/Sources/DeactivateAccountScreenViewModelTests.swift
index 1de45d587..be7dcc529 100644
--- a/UnitTests/Sources/DeactivateAccountScreenViewModelTests.swift
+++ b/UnitTests/Sources/DeactivateAccountScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct DeactivateAccountScreenViewModelTests {
     var clientProxy: ClientProxyMock!
     var viewModel: DeactivateAccountScreenViewModelProtocol!
diff --git a/UnitTests/Sources/DeclineAndBlockScreenViewModelTests.swift b/UnitTests/Sources/DeclineAndBlockScreenViewModelTests.swift
index 4a7b11529..2120fe07f 100644
--- a/UnitTests/Sources/DeclineAndBlockScreenViewModelTests.swift
+++ b/UnitTests/Sources/DeclineAndBlockScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct DeclineAndBlockScreenViewModelTests {
     var viewModel: DeclineAndBlockScreenViewModelProtocol
     var clientProxy: ClientProxyMock
diff --git a/UnitTests/Sources/DeferredFulfillmentTests.swift b/UnitTests/Sources/DeferredFulfillmentTests.swift
index 1b2463048..b641190d3 100644
--- a/UnitTests/Sources/DeferredFulfillmentTests.swift
+++ b/UnitTests/Sources/DeferredFulfillmentTests.swift
@@ -11,7 +11,6 @@ import Observation
 import Testing
 
 @MainActor
-@Suite
 struct DeferredFulfillmentTests {
     private let observable = SomeObservable()
     
diff --git a/UnitTests/Sources/EditRoomAddressScreenViewModelTests.swift b/UnitTests/Sources/EditRoomAddressScreenViewModelTests.swift
index 9968f24d5..612aa0be1 100644
--- a/UnitTests/Sources/EditRoomAddressScreenViewModelTests.swift
+++ b/UnitTests/Sources/EditRoomAddressScreenViewModelTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 @MainActor
 struct EditRoomAddressScreenViewModelTests {
     var viewModel: EditRoomAddressScreenViewModelProtocol!
diff --git a/UnitTests/Sources/ElementCallServiceTests.swift b/UnitTests/Sources/ElementCallServiceTests.swift
index 702df9ebb..9e2e5b59e 100644
--- a/UnitTests/Sources/ElementCallServiceTests.swift
+++ b/UnitTests/Sources/ElementCallServiceTests.swift
@@ -11,7 +11,6 @@ import PushKit
 import Testing
 
 @MainActor
-@Suite
 final class ElementCallServiceTests {
     private var callProvider: CXProviderMock!
     private var currentDate: Date!
diff --git a/UnitTests/Sources/EmojiPickerScreenViewModelTests.swift b/UnitTests/Sources/EmojiPickerScreenViewModelTests.swift
index b00ea0bd9..a01199ade 100644
--- a/UnitTests/Sources/EmojiPickerScreenViewModelTests.swift
+++ b/UnitTests/Sources/EmojiPickerScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct EmojiPickerScreenViewModelTests {
     var timelineProxy: TimelineProxyMock!
     
diff --git a/UnitTests/Sources/EmojiProviderTests.swift b/UnitTests/Sources/EmojiProviderTests.swift
index 69906fd7f..094952593 100644
--- a/UnitTests/Sources/EmojiProviderTests.swift
+++ b/UnitTests/Sources/EmojiProviderTests.swift
@@ -10,7 +10,6 @@
 import Testing
 import UIKit
 
-@Suite
 struct EmojiProviderTests {
     @Test @MainActor
     func emojisLoadedCategoriesAreLoadedFromLoader() async {
diff --git a/UnitTests/Sources/ExpiringTaskRunnerTests.swift b/UnitTests/Sources/ExpiringTaskRunnerTests.swift
index e0d9bb513..a5758d2ad 100644
--- a/UnitTests/Sources/ExpiringTaskRunnerTests.swift
+++ b/UnitTests/Sources/ExpiringTaskRunnerTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct ExpiringTaskRunnerTests {
     enum ExpiringTaskTestError: Error {
         case failed
diff --git a/UnitTests/Sources/GeoURITests.swift b/UnitTests/Sources/GeoURITests.swift
index 9f3dc9ee4..5130ea13c 100644
--- a/UnitTests/Sources/GeoURITests.swift
+++ b/UnitTests/Sources/GeoURITests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 struct GeoURITests {
     @Test
     func validPositiveCoordinates() throws {
diff --git a/UnitTests/Sources/GlobalSearchScreenViewModelTests.swift b/UnitTests/Sources/GlobalSearchScreenViewModelTests.swift
index 8b55fa173..435fa71dc 100644
--- a/UnitTests/Sources/GlobalSearchScreenViewModelTests.swift
+++ b/UnitTests/Sources/GlobalSearchScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct GlobalSearchScreenViewModelTests {
     var viewModel: GlobalSearchScreenViewModelProtocol!
     var context: GlobalSearchScreenViewModelType.Context!
diff --git a/UnitTests/Sources/HomeScreenRoomTests.swift b/UnitTests/Sources/HomeScreenRoomTests.swift
index 102b39d92..03b435774 100644
--- a/UnitTests/Sources/HomeScreenRoomTests.swift
+++ b/UnitTests/Sources/HomeScreenRoomTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct HomeScreenRoomTests {
     var roomSummary: RoomSummary!
     
diff --git a/UnitTests/Sources/HomeScreenViewModelTests.swift b/UnitTests/Sources/HomeScreenViewModelTests.swift
index da19e0af4..6337051ef 100644
--- a/UnitTests/Sources/HomeScreenViewModelTests.swift
+++ b/UnitTests/Sources/HomeScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 final class HomeScreenViewModelTests {
     var viewModel: HomeScreenViewModelProtocol!
     var context: HomeScreenViewModelType.Context! {
diff --git a/UnitTests/Sources/InviteUsersViewModelTests.swift b/UnitTests/Sources/InviteUsersViewModelTests.swift
index e94708a1e..670d9d1a0 100644
--- a/UnitTests/Sources/InviteUsersViewModelTests.swift
+++ b/UnitTests/Sources/InviteUsersViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct InviteUsersScreenViewModelTests {
     var viewModel: InviteUsersScreenViewModelProtocol!
     var userDiscoveryService: UserDiscoveryServiceMock!
diff --git a/UnitTests/Sources/JoinRoomScreenViewModelTests.swift b/UnitTests/Sources/JoinRoomScreenViewModelTests.swift
index 7521df309..97c48eb85 100644
--- a/UnitTests/Sources/JoinRoomScreenViewModelTests.swift
+++ b/UnitTests/Sources/JoinRoomScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 final class JoinRoomScreenViewModelTests {
     private enum TestMode {
         case joined
diff --git a/UnitTests/Sources/KeychainControllerTests.swift b/UnitTests/Sources/KeychainControllerTests.swift
index 231d1a99f..23f47241d 100644
--- a/UnitTests/Sources/KeychainControllerTests.swift
+++ b/UnitTests/Sources/KeychainControllerTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import KeychainAccess
 import Testing
 
-@Suite
 struct KeychainControllerTests {
     var keychain: KeychainController
     
diff --git a/UnitTests/Sources/KnockRequestsListScreenViewModelTests.swift b/UnitTests/Sources/KnockRequestsListScreenViewModelTests.swift
index e5a8ca44e..14b5db4b4 100644
--- a/UnitTests/Sources/KnockRequestsListScreenViewModelTests.swift
+++ b/UnitTests/Sources/KnockRequestsListScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct KnockRequestsListScreenViewModelTests {
     init() {
         AppSettings.resetAllSettings()
diff --git a/UnitTests/Sources/LayoutTests/CollapsibleFlowLayoutTests.swift b/UnitTests/Sources/LayoutTests/CollapsibleFlowLayoutTests.swift
index d03d604a4..f8b950142 100644
--- a/UnitTests/Sources/LayoutTests/CollapsibleFlowLayoutTests.swift
+++ b/UnitTests/Sources/LayoutTests/CollapsibleFlowLayoutTests.swift
@@ -10,7 +10,6 @@
 import SwiftUI
 import Testing
 
-@Suite
 struct CollapsibleFlowLayoutTests {
     @Test
     func flowLayoutWithExpandAndCollapse() {
diff --git a/UnitTests/Sources/LocalizationTests.swift b/UnitTests/Sources/LocalizationTests.swift
index 067e10d7b..cfc6f79a5 100644
--- a/UnitTests/Sources/LocalizationTests.swift
+++ b/UnitTests/Sources/LocalizationTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 final class LocalizationTests {
     deinit {
         Bundle.overrideLocalizations = nil
diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift
index 1f5782838..57a45ce51 100644
--- a/UnitTests/Sources/LoggingTests.swift
+++ b/UnitTests/Sources/LoggingTests.swift
@@ -11,7 +11,6 @@ import Foundation
 @testable import MatrixRustSDK
 import Testing
 
-@Suite
 final class LoggingTests {
     private enum Constants {
         static let genericFailure = "Test failed"
diff --git a/UnitTests/Sources/LoginScreenViewModelTests.swift b/UnitTests/Sources/LoginScreenViewModelTests.swift
index 9e8214f4b..4c6430667 100644
--- a/UnitTests/Sources/LoginScreenViewModelTests.swift
+++ b/UnitTests/Sources/LoginScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct LoginScreenViewModelTests {
     var viewModel: LoginScreenViewModelProtocol!
     var context: LoginScreenViewModelType.Context {
diff --git a/UnitTests/Sources/ManageRoomMemberSheetViewModelTests.swift b/UnitTests/Sources/ManageRoomMemberSheetViewModelTests.swift
index 8bd6cdb33..1929e974a 100644
--- a/UnitTests/Sources/ManageRoomMemberSheetViewModelTests.swift
+++ b/UnitTests/Sources/ManageRoomMemberSheetViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct ManageRoomMemberSheetViewModelTests {
     private var viewModel: ManageRoomMemberSheetViewModel!
     private var context: ManageRoomMemberSheetViewModel.Context! {
diff --git a/UnitTests/Sources/MapTilerURLBuilderTests.swift b/UnitTests/Sources/MapTilerURLBuilderTests.swift
index d4590847e..06a0f29c0 100644
--- a/UnitTests/Sources/MapTilerURLBuilderTests.swift
+++ b/UnitTests/Sources/MapTilerURLBuilderTests.swift
@@ -10,7 +10,6 @@ import CoreLocation
 @testable import ElementX
 import Testing
 
-@Suite
 struct MapTilerURLBuilderTests {
     private static let baseURL: URL = "http://www.foo.com"
     private static let apiKey = "some_key"
diff --git a/UnitTests/Sources/MatrixEntityRegexTests.swift b/UnitTests/Sources/MatrixEntityRegexTests.swift
index 1201d7d5c..7febdc7eb 100644
--- a/UnitTests/Sources/MatrixEntityRegexTests.swift
+++ b/UnitTests/Sources/MatrixEntityRegexTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct MatrixEntityRegexTests {
     @Test
     func homeserver() {
diff --git a/UnitTests/Sources/MediaPlayerProviderTests.swift b/UnitTests/Sources/MediaPlayerProviderTests.swift
index 549b3f541..858e9b6a7 100644
--- a/UnitTests/Sources/MediaPlayerProviderTests.swift
+++ b/UnitTests/Sources/MediaPlayerProviderTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct MediaPlayerProviderTests {
     private var mediaPlayerProvider: MediaPlayerProvider
     
diff --git a/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift b/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
index dde25d63c..39c185d16 100644
--- a/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
+++ b/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
@@ -12,7 +12,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 struct MediaLoaderTests {
     @Test
     func mediaRequestCoalescing() async throws {
diff --git a/UnitTests/Sources/MediaProvider/MediaProviderTests.swift b/UnitTests/Sources/MediaProvider/MediaProviderTests.swift
index ac089fe1c..64aa21b2a 100644
--- a/UnitTests/Sources/MediaProvider/MediaProviderTests.swift
+++ b/UnitTests/Sources/MediaProvider/MediaProviderTests.swift
@@ -12,7 +12,6 @@ import Kingfisher
 import SwiftUI
 import Testing
 
-@Suite
 @MainActor
 struct MediaProviderTests {
     private var mediaLoader: MediaLoaderMock
diff --git a/UnitTests/Sources/MediaUploadPreviewScreenViewModelTests.swift b/UnitTests/Sources/MediaUploadPreviewScreenViewModelTests.swift
index 0dd0da22d..31f0291b6 100644
--- a/UnitTests/Sources/MediaUploadPreviewScreenViewModelTests.swift
+++ b/UnitTests/Sources/MediaUploadPreviewScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 @MainActor
 final class MediaUploadPreviewScreenViewModelTests {
     var timelineProxy: TimelineProxyMock!
diff --git a/UnitTests/Sources/MediaUploadingPreprocessorTests.swift b/UnitTests/Sources/MediaUploadingPreprocessorTests.swift
index cd4ab35df..7484c49c7 100644
--- a/UnitTests/Sources/MediaUploadingPreprocessorTests.swift
+++ b/UnitTests/Sources/MediaUploadingPreprocessorTests.swift
@@ -11,7 +11,6 @@ import SwiftUI
 import Testing
 import UniformTypeIdentifiers
 
-@Suite
 final class MediaUploadingPreprocessorTests {
     let maxUploadSize: UInt = 100 * 1024 * 1024
     var appSettings: AppSettings!
diff --git a/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift b/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift
index 1f0a9f970..3414b885b 100644
--- a/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift
+++ b/UnitTests/Sources/MessageForwardingScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct MessageForwardingScreenViewModelTests {
     let forwardingItem = MessageForwardingItem(id: .event(uniqueID: .init("t1"), eventOrTransactionID: .eventID("t1")),
                                                roomID: "1",
diff --git a/UnitTests/Sources/NavigationRootCoordinatorTests.swift b/UnitTests/Sources/NavigationRootCoordinatorTests.swift
index 69641f54e..4f4360b8a 100644
--- a/UnitTests/Sources/NavigationRootCoordinatorTests.swift
+++ b/UnitTests/Sources/NavigationRootCoordinatorTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct NavigationRootCoordinatorTests {
     private var navigationRootCoordinator: NavigationRootCoordinator
     
diff --git a/UnitTests/Sources/NavigationSplitCoordinatorTests.swift b/UnitTests/Sources/NavigationSplitCoordinatorTests.swift
index 4530ac98a..f487d6987 100644
--- a/UnitTests/Sources/NavigationSplitCoordinatorTests.swift
+++ b/UnitTests/Sources/NavigationSplitCoordinatorTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 @MainActor
 struct NavigationSplitCoordinatorTests {
     private var navigationSplitCoordinator: NavigationSplitCoordinator
diff --git a/UnitTests/Sources/NavigationStackCoordinatorTests.swift b/UnitTests/Sources/NavigationStackCoordinatorTests.swift
index 4eaf3e15a..441afa253 100644
--- a/UnitTests/Sources/NavigationStackCoordinatorTests.swift
+++ b/UnitTests/Sources/NavigationStackCoordinatorTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct NavigationStackCoordinatorTests {
     private var navigationStackCoordinator: NavigationStackCoordinator
     
diff --git a/UnitTests/Sources/NavigationTabCoordinatorTests.swift b/UnitTests/Sources/NavigationTabCoordinatorTests.swift
index 6077d5537..ed9590a2b 100644
--- a/UnitTests/Sources/NavigationTabCoordinatorTests.swift
+++ b/UnitTests/Sources/NavigationTabCoordinatorTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct NavigationTabCoordinatorTests {
     enum TestTab { case tab, chats, spaces }
     private var navigationTabCoordinator: NavigationTabCoordinator<TestTab>
diff --git a/UnitTests/Sources/NotificationContentBuilderTests.swift b/UnitTests/Sources/NotificationContentBuilderTests.swift
index c861591b5..14421c8e1 100644
--- a/UnitTests/Sources/NotificationContentBuilderTests.swift
+++ b/UnitTests/Sources/NotificationContentBuilderTests.swift
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import Testing
 import UserNotifications
 
-@Suite
 struct NotificationContentBuilderTests {
     var notificationContentBuilder: NotificationContentBuilder
     var mediaProvider: MediaProviderMock
diff --git a/UnitTests/Sources/NotificationManager/NotificationManagerTests.swift b/UnitTests/Sources/NotificationManager/NotificationManagerTests.swift
index fb4e32522..6ec714a8d 100644
--- a/UnitTests/Sources/NotificationManager/NotificationManagerTests.swift
+++ b/UnitTests/Sources/NotificationManager/NotificationManagerTests.swift
@@ -11,7 +11,6 @@ import Combine
 import NotificationCenter
 import Testing
 
-@Suite
 @MainActor
 final class NotificationManagerTests {
     var notificationManager: NotificationManager!
diff --git a/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift b/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift
index 76fbf0224..55bbb648a 100644
--- a/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift
+++ b/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing
 
-@Suite
 @MainActor
 struct NotificationSettingsEditScreenViewModelTests {
     private var viewModel: NotificationSettingsEditScreenViewModelProtocol!
diff --git a/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift b/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift
index db3704256..97ef5d465 100644
--- a/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing
 
-@Suite
 @MainActor
 struct NotificationSettingsScreenViewModelTests {
     private var viewModel: NotificationSettingsScreenViewModelProtocol
diff --git a/UnitTests/Sources/PermalinkTests.swift b/UnitTests/Sources/PermalinkTests.swift
index c85e974e3..a321360b1 100644
--- a/UnitTests/Sources/PermalinkTests.swift
+++ b/UnitTests/Sources/PermalinkTests.swift
@@ -12,7 +12,6 @@ import MatrixRustSDK
 import Testing
 
 /// Just for API sanity checking, they're already properly tested in the SDK/Ruma
-@Suite
 struct PermalinkTests {
     @Test
     func userIdentifierPermalink() throws {
diff --git a/UnitTests/Sources/PillContextTests.swift b/UnitTests/Sources/PillContextTests.swift
index b8fc8bdbb..74663c24b 100644
--- a/UnitTests/Sources/PillContextTests.swift
+++ b/UnitTests/Sources/PillContextTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct PillContextTests {
     @Test
     func user() async {
diff --git a/UnitTests/Sources/PinnedEventsBannerStateTests.swift b/UnitTests/Sources/PinnedEventsBannerStateTests.swift
index b41174d8c..1a49c9045 100644
--- a/UnitTests/Sources/PinnedEventsBannerStateTests.swift
+++ b/UnitTests/Sources/PinnedEventsBannerStateTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct PinnedEventsBannerStateTests {
     @Test
     func empty() {
diff --git a/UnitTests/Sources/PollFormScreenViewModelTests.swift b/UnitTests/Sources/PollFormScreenViewModelTests.swift
index aa96557d9..43a84c208 100644
--- a/UnitTests/Sources/PollFormScreenViewModelTests.swift
+++ b/UnitTests/Sources/PollFormScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct PollFormScreenViewModelTests {
     private let timelineProxy = TimelineProxyMock(.init())
     
diff --git a/UnitTests/Sources/QRCodeLoginScreenViewModelTests.swift b/UnitTests/Sources/QRCodeLoginScreenViewModelTests.swift
index 9d1759660..132852a0a 100644
--- a/UnitTests/Sources/QRCodeLoginScreenViewModelTests.swift
+++ b/UnitTests/Sources/QRCodeLoginScreenViewModelTests.swift
@@ -12,7 +12,6 @@ import MatrixRustSDKMocks
 import Testing
 
 @MainActor
-@Suite
 struct QRCodeLoginScreenViewModelTests {
     private enum Mode { case login, linkDesktop, linkMobile }
     
diff --git a/UnitTests/Sources/RemotePreferenceTests.swift b/UnitTests/Sources/RemotePreferenceTests.swift
index df0a8214b..d847ff83d 100644
--- a/UnitTests/Sources/RemotePreferenceTests.swift
+++ b/UnitTests/Sources/RemotePreferenceTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 struct RemotePreferenceTests {
     @Test
     func overrideAndReset() {
diff --git a/UnitTests/Sources/ReportContentScreenViewModelTests.swift b/UnitTests/Sources/ReportContentScreenViewModelTests.swift
index 534c5ec77..89fc4a883 100644
--- a/UnitTests/Sources/ReportContentScreenViewModelTests.swift
+++ b/UnitTests/Sources/ReportContentScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct ReportContentScreenViewModelTests {
     let eventID = "test-id"
     let senderID = "@meany:server.com"
diff --git a/UnitTests/Sources/ReportRoomScreenViewModelTests.swift b/UnitTests/Sources/ReportRoomScreenViewModelTests.swift
index f98bb5f85..90bf1ac01 100644
--- a/UnitTests/Sources/ReportRoomScreenViewModelTests.swift
+++ b/UnitTests/Sources/ReportRoomScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct ReportRoomScreenViewModelTests {
     private var viewModel: ReportRoomScreenViewModelProtocol
     private var roomProxy: JoinedRoomProxyMock
diff --git a/UnitTests/Sources/ResolveVerifiedUserSendFailureScreenViewModelTests.swift b/UnitTests/Sources/ResolveVerifiedUserSendFailureScreenViewModelTests.swift
index c75be1262..d99cdf169 100644
--- a/UnitTests/Sources/ResolveVerifiedUserSendFailureScreenViewModelTests.swift
+++ b/UnitTests/Sources/ResolveVerifiedUserSendFailureScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct ResolveVerifiedUserSendFailureScreenViewModelTests {
     private let roomProxy = JoinedRoomProxyMock(.init())
     
diff --git a/UnitTests/Sources/RestorationTokenTests.swift b/UnitTests/Sources/RestorationTokenTests.swift
index 84e608965..36a945134 100644
--- a/UnitTests/Sources/RestorationTokenTests.swift
+++ b/UnitTests/Sources/RestorationTokenTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import MatrixRustSDK
 import Testing
 
-@Suite
 struct RestorationTokenTests {
     @Test
     func decodeTokenWithSlidingSyncProxy() throws {
diff --git a/UnitTests/Sources/RoomChangePermissionsScreenViewModelTests.swift b/UnitTests/Sources/RoomChangePermissionsScreenViewModelTests.swift
index acd18be9a..cf79523e8 100644
--- a/UnitTests/Sources/RoomChangePermissionsScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomChangePermissionsScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct RoomChangePermissionsScreenViewModelTests {
     var roomProxy: JoinedRoomProxyMock!
     var viewModel: RoomChangePermissionsScreenViewModelProtocol!
diff --git a/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift b/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift
index e031bbb1d..88e52aea6 100644
--- a/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomChangeRolesScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct RoomChangeRolesScreenViewModelTests {
     var viewModel: RoomChangeRolesScreenViewModelProtocol!
     var roomProxy: JoinedRoomProxyMock!
diff --git a/UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift b/UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift
index fc7814c8f..2566eddd3 100644
--- a/UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing
 
-@Suite
 @MainActor
 struct RoomDetailsEditScreenViewModelTests {
     var viewModel: RoomDetailsEditScreenViewModel!
diff --git a/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift b/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift
index 4e3d1fa58..ac0905332 100644
--- a/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomDetailsScreenViewModelTests.swift
@@ -13,7 +13,6 @@ import MatrixRustSDK
 import SwiftUI
 import Testing
 
-@Suite
 @MainActor
 struct RoomDetailsScreenViewModelTests {
     var viewModel: RoomDetailsScreenViewModel!
diff --git a/UnitTests/Sources/RoomEventStringBuilderTests.swift b/UnitTests/Sources/RoomEventStringBuilderTests.swift
index b30297ca2..4811e0cbb 100644
--- a/UnitTests/Sources/RoomEventStringBuilderTests.swift
+++ b/UnitTests/Sources/RoomEventStringBuilderTests.swift
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing
 
-@Suite
 struct RoomEventStringBuilderTests {
     private let ownUserID: String
     private let stringBuilder: RoomEventStringBuilder
diff --git a/UnitTests/Sources/RoomFlowCoordinatorTests.swift b/UnitTests/Sources/RoomFlowCoordinatorTests.swift
index 135c04946..b38250dbc 100644
--- a/UnitTests/Sources/RoomFlowCoordinatorTests.swift
+++ b/UnitTests/Sources/RoomFlowCoordinatorTests.swift
@@ -11,7 +11,6 @@ import Combine
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 @MainActor
 final class RoomFlowCoordinatorTests {
     var clientProxy: ClientProxyMock!
diff --git a/UnitTests/Sources/RoomListFiltersStateTests.swift b/UnitTests/Sources/RoomListFiltersStateTests.swift
index cc0998909..c7d28b763 100644
--- a/UnitTests/Sources/RoomListFiltersStateTests.swift
+++ b/UnitTests/Sources/RoomListFiltersStateTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 final class RoomListFiltersStateTests {
     var appSettings: AppSettings
     var state: RoomListFiltersState
diff --git a/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift b/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift
index 151138912..b32c38285 100644
--- a/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift
+++ b/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct RoomMemberDetailsViewModelTests {
     var viewModel: RoomMemberDetailsScreenViewModelProtocol!
     var roomProxyMock: JoinedRoomProxyMock!
diff --git a/UnitTests/Sources/RoomMembersFlowCoordinatorTests.swift b/UnitTests/Sources/RoomMembersFlowCoordinatorTests.swift
index 32eb4962c..74ba99292 100644
--- a/UnitTests/Sources/RoomMembersFlowCoordinatorTests.swift
+++ b/UnitTests/Sources/RoomMembersFlowCoordinatorTests.swift
@@ -10,7 +10,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct RoomMembersFlowCoordinatorTests {
     var membersFlowCoordinator: RoomMembersFlowCoordinator!
     var navigationStackCoordinator: NavigationStackCoordinator!
diff --git a/UnitTests/Sources/RoomMembersListScreenViewModelTests.swift b/UnitTests/Sources/RoomMembersListScreenViewModelTests.swift
index d12986707..7b4ff8d94 100644
--- a/UnitTests/Sources/RoomMembersListScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomMembersListScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct RoomMembersListScreenViewModelTests {
     var viewModel: RoomMembersListScreenViewModel!
     var roomProxy: JoinedRoomProxyMock!
diff --git a/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift b/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
index 785028bd9..0264756cb 100644
--- a/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import MatrixRustSDK
 import Testing
 
-@Suite
 @MainActor
 struct RoomNotificationSettingsScreenViewModelTests {
     var roomProxyMock: JoinedRoomProxyMock!
diff --git a/UnitTests/Sources/RoomPermissionsTests.swift b/UnitTests/Sources/RoomPermissionsTests.swift
index 910417d18..4c2254cca 100644
--- a/UnitTests/Sources/RoomPermissionsTests.swift
+++ b/UnitTests/Sources/RoomPermissionsTests.swift
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing
 
-@Suite
 struct RoomPermissionsTests {
     @Test
     func fromRust() {
diff --git a/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift b/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift
index 47ac59390..6dc5a3f2d 100644
--- a/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 @MainActor
 struct RoomPollsHistoryScreenViewModelTests {
     var viewModel: RoomPollsHistoryScreenViewModelProtocol!
diff --git a/UnitTests/Sources/RoomRolesAndPermissionsScreenViewModelTests.swift b/UnitTests/Sources/RoomRolesAndPermissionsScreenViewModelTests.swift
index 60085ba39..805fd44f4 100644
--- a/UnitTests/Sources/RoomRolesAndPermissionsScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomRolesAndPermissionsScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct RoomRolesAndPermissionsScreenViewModelTests {
     var viewModel: RoomRolesAndPermissionsScreenViewModelProtocol!
     var roomProxy: JoinedRoomProxyMock!
diff --git a/UnitTests/Sources/RoomScreenViewModelTests.swift b/UnitTests/Sources/RoomScreenViewModelTests.swift
index 9873a6949..44dfcf652 100644
--- a/UnitTests/Sources/RoomScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomScreenViewModelTests.swift
@@ -13,7 +13,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 @MainActor
 final class RoomScreenViewModelTests {
     private var viewModel: RoomScreenViewModel!
diff --git a/UnitTests/Sources/RoomStateEventStringBuilderTests.swift b/UnitTests/Sources/RoomStateEventStringBuilderTests.swift
index 2569a6adf..50007f542 100644
--- a/UnitTests/Sources/RoomStateEventStringBuilderTests.swift
+++ b/UnitTests/Sources/RoomStateEventStringBuilderTests.swift
@@ -10,7 +10,6 @@
 import MatrixRustSDK
 import Testing
 
-@Suite
 struct RoomStateEventStringBuilderTests {
     private let userID: String
     private let stringBuilder: RoomStateEventStringBuilder
diff --git a/UnitTests/Sources/RoomSummaryProviderTests.swift b/UnitTests/Sources/RoomSummaryProviderTests.swift
index 30c639de8..630128f81 100644
--- a/UnitTests/Sources/RoomSummaryProviderTests.swift
+++ b/UnitTests/Sources/RoomSummaryProviderTests.swift
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 @MainActor
 final class RoomSummaryProviderTests {
     private let baseFilters: [RoomListEntriesDynamicFilterKind] = [.any(filters: [.all(filters: [.nonSpace, .nonLeft]),
diff --git a/UnitTests/Sources/RoomSummaryTests.swift b/UnitTests/Sources/RoomSummaryTests.swift
index b067ee313..4151ec6fb 100644
--- a/UnitTests/Sources/RoomSummaryTests.swift
+++ b/UnitTests/Sources/RoomSummaryTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct RoomSummaryTests {
     // swiftlint:disable:next large_tuple
     let roomDetails: (id: String, name: String, avatarURL: URL) = ("room_id", "Room Name", "mxc://hs.tld/room/avatar")
diff --git a/UnitTests/Sources/RoomTests.swift b/UnitTests/Sources/RoomTests.swift
index 422819e51..67b9538e3 100644
--- a/UnitTests/Sources/RoomTests.swift
+++ b/UnitTests/Sources/RoomTests.swift
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 struct RoomTests {
     @Test
     func callIntent() async {
diff --git a/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift b/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift
index 27e4a0ca2..064da6f0c 100644
--- a/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift
+++ b/UnitTests/Sources/SecureBackupLogoutConfirmationScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct SecureBackupLogoutConfirmationScreenViewModelTests {
     private var viewModel: SecureBackupLogoutConfirmationScreenViewModel
     private var context: SecureBackupLogoutConfirmationScreenViewModel.Context {
diff --git a/UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift b/UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift
index 7479f7fa5..ba0ddde69 100644
--- a/UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift
+++ b/UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import MatrixRustSDK
 import Testing
 
-@Suite
 @MainActor
 final class SecurityAndPrivacyScreenViewModelTests {
     var viewModel: SecurityAndPrivacyScreenViewModelProtocol!
diff --git a/UnitTests/Sources/ServerConfigurationScreenViewStateTests.swift b/UnitTests/Sources/ServerConfigurationScreenViewStateTests.swift
index ab40169c8..5448c9501 100644
--- a/UnitTests/Sources/ServerConfigurationScreenViewStateTests.swift
+++ b/UnitTests/Sources/ServerConfigurationScreenViewStateTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct ServerConfirmationScreenViewStateTests {
     @Test
     func loginMessageString() {
diff --git a/UnitTests/Sources/ServerConfirmationScreenViewModelTests.swift b/UnitTests/Sources/ServerConfirmationScreenViewModelTests.swift
index 3bf76ffa7..390a0c390 100644
--- a/UnitTests/Sources/ServerConfirmationScreenViewModelTests.swift
+++ b/UnitTests/Sources/ServerConfirmationScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import MatrixRustSDKMocks
 import SwiftUI
 import Testing
 
-@Suite
 @MainActor
 final class ServerConfirmationScreenViewModelTests {
     var clientFactory: AuthenticationClientFactoryMock!
diff --git a/UnitTests/Sources/ServerSelectionScreenViewModelTests.swift b/UnitTests/Sources/ServerSelectionScreenViewModelTests.swift
index bea78a2c4..a37f601c4 100644
--- a/UnitTests/Sources/ServerSelectionScreenViewModelTests.swift
+++ b/UnitTests/Sources/ServerSelectionScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct ServerSelectionScreenViewModelTests {
     var clientFactory: AuthenticationClientFactoryMock!
     var service: AuthenticationServiceProtocol!
diff --git a/UnitTests/Sources/SessionDirectoriesTests.swift b/UnitTests/Sources/SessionDirectoriesTests.swift
index 648e59a3f..d98304935 100644
--- a/UnitTests/Sources/SessionDirectoriesTests.swift
+++ b/UnitTests/Sources/SessionDirectoriesTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct SessionDirectoriesTests {
     let fileManager = FileManager.default
     
diff --git a/UnitTests/Sources/SessionVerificationStateMachineTests.swift b/UnitTests/Sources/SessionVerificationStateMachineTests.swift
index 0ca9d2028..d7634c1b9 100644
--- a/UnitTests/Sources/SessionVerificationStateMachineTests.swift
+++ b/UnitTests/Sources/SessionVerificationStateMachineTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct SessionVerificationStateMachineTests {
     private var stateMachine: SessionVerificationScreenStateMachine
     
diff --git a/UnitTests/Sources/SessionVerificationViewModelTests.swift b/UnitTests/Sources/SessionVerificationViewModelTests.swift
index 199d1dc6d..2229e175d 100644
--- a/UnitTests/Sources/SessionVerificationViewModelTests.swift
+++ b/UnitTests/Sources/SessionVerificationViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Foundation
 import Testing
 
-@Suite
 @MainActor
 struct SessionVerificationViewModelTests {
     var viewModel: SessionVerificationScreenViewModelProtocol!
diff --git a/UnitTests/Sources/SettingsScreenViewModelTests.swift b/UnitTests/Sources/SettingsScreenViewModelTests.swift
index b1c03f7db..2322b872a 100644
--- a/UnitTests/Sources/SettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/SettingsScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct SettingsScreenViewModelTests {
     private var viewModel: SettingsScreenViewModelProtocol
     private var context: SettingsScreenViewModelType.Context
diff --git a/UnitTests/Sources/SoftLogoutScreenViewModelTests.swift b/UnitTests/Sources/SoftLogoutScreenViewModelTests.swift
index c34f91a4e..f870e1d25 100644
--- a/UnitTests/Sources/SoftLogoutScreenViewModelTests.swift
+++ b/UnitTests/Sources/SoftLogoutScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct SoftLogoutScreenViewModelTests {
     private let credentials = SoftLogoutScreenCredentials(userID: "mock_user_id",
                                                           homeserverName: "https://example.com",
diff --git a/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift b/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift
index e71642d62..e995f6a09 100644
--- a/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift
+++ b/UnitTests/Sources/SpaceAddRoomsScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct SpaceAddRoomsScreenViewModelTests {
     var spaceRoomListProxy: SpaceRoomListProxyMock
     var spaceServiceProxy: SpaceServiceProxyMock
diff --git a/UnitTests/Sources/SpaceListScreenViewModelTests.swift b/UnitTests/Sources/SpaceListScreenViewModelTests.swift
index 06da32429..58058f85c 100644
--- a/UnitTests/Sources/SpaceListScreenViewModelTests.swift
+++ b/UnitTests/Sources/SpaceListScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 final class SpacesScreenViewModelTests {
     var topLevelSpacesSubject: CurrentValueSubject<[SpaceServiceRoom], Never>
     var spaceServiceProxy: SpaceServiceProxyMock
diff --git a/UnitTests/Sources/SpaceScreenViewModelTests.swift b/UnitTests/Sources/SpaceScreenViewModelTests.swift
index cf0321929..18dd9d709 100644
--- a/UnitTests/Sources/SpaceScreenViewModelTests.swift
+++ b/UnitTests/Sources/SpaceScreenViewModelTests.swift
@@ -12,7 +12,6 @@ import MatrixRustSDK
 import MatrixRustSDKMocks
 import Testing
 
-@Suite
 @MainActor
 struct SpaceScreenViewModelTests {
     var spaceRoomListProxy: SpaceRoomListProxyMock!
diff --git a/UnitTests/Sources/StartChatViewModelTests.swift b/UnitTests/Sources/StartChatViewModelTests.swift
index 2488b2252..e762831d9 100644
--- a/UnitTests/Sources/StartChatViewModelTests.swift
+++ b/UnitTests/Sources/StartChatViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct StartChatScreenViewModelTests {
     private var viewModel: StartChatScreenViewModelProtocol!
     private var clientProxy: ClientProxyMock!
diff --git a/UnitTests/Sources/StaticLocationScreenViewModelTests.swift b/UnitTests/Sources/StaticLocationScreenViewModelTests.swift
index e9933d542..1d47182c7 100644
--- a/UnitTests/Sources/StaticLocationScreenViewModelTests.swift
+++ b/UnitTests/Sources/StaticLocationScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct StaticLocationScreenViewModelTests {
     private let timelineProxy = TimelineProxyMock(.init())
     private var viewModel: StaticLocationScreenViewModelProtocol
diff --git a/UnitTests/Sources/StringTests.swift b/UnitTests/Sources/StringTests.swift
index bdc4362fb..3f8e630e7 100644
--- a/UnitTests/Sources/StringTests.swift
+++ b/UnitTests/Sources/StringTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 struct StringTests {
     @Test
     func emptyIsAscii() {
diff --git a/UnitTests/Sources/TextBasedRoomTimelineTests.swift b/UnitTests/Sources/TextBasedRoomTimelineTests.swift
index 41820ea24..e1c3385da 100644
--- a/UnitTests/Sources/TextBasedRoomTimelineTests.swift
+++ b/UnitTests/Sources/TextBasedRoomTimelineTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct TextBasedRoomTimelineTests {
     @Test
     func textRoomTimelineItemWhitespaceEnd() {
diff --git a/UnitTests/Sources/TimelineItemFactoryTests.swift b/UnitTests/Sources/TimelineItemFactoryTests.swift
index 241becad5..a50496980 100644
--- a/UnitTests/Sources/TimelineItemFactoryTests.swift
+++ b/UnitTests/Sources/TimelineItemFactoryTests.swift
@@ -11,7 +11,6 @@ import MatrixRustSDK
 import Testing
 
 @MainActor
-@Suite
 struct TimelineItemFactoryTests {
     @Test
     func callInvite() throws {
diff --git a/UnitTests/Sources/TimelineMediaPreviewDataSourceTests.swift b/UnitTests/Sources/TimelineMediaPreviewDataSourceTests.swift
index 1b38051a1..ecf74196a 100644
--- a/UnitTests/Sources/TimelineMediaPreviewDataSourceTests.swift
+++ b/UnitTests/Sources/TimelineMediaPreviewDataSourceTests.swift
@@ -10,7 +10,6 @@
 import QuickLook
 import Testing
 
-@Suite
 @MainActor
 struct TimelineMediaPreviewDataSourceTests {
     var initialMediaItems: [EventBasedMessageTimelineItemProtocol]!
diff --git a/UnitTests/Sources/TimelineMediaPreviewViewModelTests.swift b/UnitTests/Sources/TimelineMediaPreviewViewModelTests.swift
index 9e41ec8ef..1c55d4533 100644
--- a/UnitTests/Sources/TimelineMediaPreviewViewModelTests.swift
+++ b/UnitTests/Sources/TimelineMediaPreviewViewModelTests.swift
@@ -13,7 +13,6 @@ import QuickLook
 import SwiftUI
 import Testing
 
-@Suite
 @MainActor
 struct TimelineMediaPreviewViewModelTests {
     var viewModel: TimelineMediaPreviewViewModel!
diff --git a/UnitTests/Sources/TimelineViewModelTests.swift b/UnitTests/Sources/TimelineViewModelTests.swift
index 4348344df..34a362704 100644
--- a/UnitTests/Sources/TimelineViewModelTests.swift
+++ b/UnitTests/Sources/TimelineViewModelTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import MatrixRustSDK
 import Testing
 
-@Suite
 @MainActor
 final class TimelineViewModelTests {
     var userIndicatorControllerMock: UserIndicatorControllerMock!
diff --git a/UnitTests/Sources/URLComponentsTests.swift b/UnitTests/Sources/URLComponentsTests.swift
index aed76e90a..e25a30b01 100644
--- a/UnitTests/Sources/URLComponentsTests.swift
+++ b/UnitTests/Sources/URLComponentsTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct URLComponentsTests {
     @Test
     func addFragmentQueryItems() throws {
diff --git a/UnitTests/Sources/URLTests.swift b/UnitTests/Sources/URLTests.swift
index 123c54dbb..b9a592f7e 100644
--- a/UnitTests/Sources/URLTests.swift
+++ b/UnitTests/Sources/URLTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct URLTests {
     @Test
     func urlDirectoryName() throws {
diff --git a/UnitTests/Sources/UserAgentBuilderTests.swift b/UnitTests/Sources/UserAgentBuilderTests.swift
index 92b60e28e..635396e94 100644
--- a/UnitTests/Sources/UserAgentBuilderTests.swift
+++ b/UnitTests/Sources/UserAgentBuilderTests.swift
@@ -9,7 +9,6 @@
 @testable import ElementX
 import Testing
 
-@Suite
 struct UserAgentBuilderTests {
     @Test
     func isNotUnknow() {
diff --git a/UnitTests/Sources/UserDetailsEditScreenViewModelTests.swift b/UnitTests/Sources/UserDetailsEditScreenViewModelTests.swift
index 5f85bbbd7..98e0661f0 100644
--- a/UnitTests/Sources/UserDetailsEditScreenViewModelTests.swift
+++ b/UnitTests/Sources/UserDetailsEditScreenViewModelTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Testing
 
 @MainActor
-@Suite
 struct UserDetailsEditScreenViewModelTests {
     private var viewModel: UserDetailsEditScreenViewModel!
     private var userIndicatorController: UserIndicatorControllerMock!
diff --git a/UnitTests/Sources/UserDiscoveryService/UserDiscoveryServiceTest.swift b/UnitTests/Sources/UserDiscoveryService/UserDiscoveryServiceTest.swift
index b50bf4c55..1d257e05c 100644
--- a/UnitTests/Sources/UserDiscoveryService/UserDiscoveryServiceTest.swift
+++ b/UnitTests/Sources/UserDiscoveryService/UserDiscoveryServiceTest.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct UserDiscoveryServiceTest {
     private var service: UserDiscoveryService
     private var clientProxy: ClientProxyMock
diff --git a/UnitTests/Sources/UserIndicatorControllerTests.swift b/UnitTests/Sources/UserIndicatorControllerTests.swift
index 98577fa2a..db626ab7b 100644
--- a/UnitTests/Sources/UserIndicatorControllerTests.swift
+++ b/UnitTests/Sources/UserIndicatorControllerTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct UserIndicatorControllerTests {
     private var indicatorController: UserIndicatorController
     
diff --git a/UnitTests/Sources/UserPreferenceTests.swift b/UnitTests/Sources/UserPreferenceTests.swift
index f5ff15a7f..0852e539f 100644
--- a/UnitTests/Sources/UserPreferenceTests.swift
+++ b/UnitTests/Sources/UserPreferenceTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct UserPreferenceTests {
     init() {
         UserDefaults.testDefaults.removeVolatileDomain(forName: .userDefaultsSuiteName)
diff --git a/UnitTests/Sources/UserProfileScreenViewModelTests.swift b/UnitTests/Sources/UserProfileScreenViewModelTests.swift
index 5961fb517..06567fa68 100644
--- a/UnitTests/Sources/UserProfileScreenViewModelTests.swift
+++ b/UnitTests/Sources/UserProfileScreenViewModelTests.swift
@@ -10,7 +10,6 @@
 import Testing
 
 @MainActor
-@Suite
 struct UserProfileScreenViewModelTests {
     @Test
     func initialState() async throws {
diff --git a/UnitTests/Sources/UserSessionFlowCoordinatorTests.swift b/UnitTests/Sources/UserSessionFlowCoordinatorTests.swift
index 34824f1c9..4482408b2 100644
--- a/UnitTests/Sources/UserSessionFlowCoordinatorTests.swift
+++ b/UnitTests/Sources/UserSessionFlowCoordinatorTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct UserSessionFlowCoordinatorTests {
     private var userSessionFlowCoordinator: UserSessionFlowCoordinator!
     private var rootCoordinator: NavigationRootCoordinator!
diff --git a/UnitTests/Sources/VoiceMessageCacheTests.swift b/UnitTests/Sources/VoiceMessageCacheTests.swift
index 296e7345a..b779c4e50 100644
--- a/UnitTests/Sources/VoiceMessageCacheTests.swift
+++ b/UnitTests/Sources/VoiceMessageCacheTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 final class VoiceMessageCacheTests {
     private var voiceMessageCache: VoiceMessageCache
     private var mediaSource: MediaSourceProxy
diff --git a/UnitTests/Sources/VoiceMessageMediaManagerTests.swift b/UnitTests/Sources/VoiceMessageMediaManagerTests.swift
index 30af8ffee..2c75cdfdb 100644
--- a/UnitTests/Sources/VoiceMessageMediaManagerTests.swift
+++ b/UnitTests/Sources/VoiceMessageMediaManagerTests.swift
@@ -12,7 +12,6 @@ import Foundation
 import Testing
 
 @MainActor
-@Suite
 struct VoiceMessageMediaManagerTests {
     private var voiceMessageMediaManager: VoiceMessageMediaManager
     private var voiceMessageCache: VoiceMessageCacheMock
diff --git a/UnitTests/Sources/VoiceMessageRecorderTests.swift b/UnitTests/Sources/VoiceMessageRecorderTests.swift
index 226d8e9c5..acbb9dce5 100644
--- a/UnitTests/Sources/VoiceMessageRecorderTests.swift
+++ b/UnitTests/Sources/VoiceMessageRecorderTests.swift
@@ -11,7 +11,6 @@ import Combine
 import Foundation
 import Testing
 
-@Suite
 @MainActor
 struct VoiceMessageRecorderTests {
     private var voiceMessageRecorder: VoiceMessageRecorder!
diff --git a/compound-ios/Tests/CompoundTests/AvatarColorsTests.swift b/compound-ios/Tests/CompoundTests/AvatarColorsTests.swift
index 2e1ffff94..8f635d299 100644
--- a/compound-ios/Tests/CompoundTests/AvatarColorsTests.swift
+++ b/compound-ios/Tests/CompoundTests/AvatarColorsTests.swift
@@ -11,7 +11,6 @@ import Foundation
 import SwiftUI
 import Testing
 
-@Suite
 struct DecorativeColorsTests {
     struct TestCase {
         let input: String
diff --git a/compound-ios/Tests/CompoundTests/FontSizeTests.swift b/compound-ios/Tests/CompoundTests/FontSizeTests.swift
index 752c63a1f..4d3285d68 100644
--- a/compound-ios/Tests/CompoundTests/FontSizeTests.swift
+++ b/compound-ios/Tests/CompoundTests/FontSizeTests.swift
@@ -11,7 +11,6 @@ import SwiftUI
 import Testing
 
 @MainActor
-@Suite
 struct FontSizeTests {
     /// Test all system text styles to assert mapping between `Font` and `UIFont`.
     @Test("Text style")
diff --git a/compound-ios/Tests/CompoundTests/OverrideColorTests.swift b/compound-ios/Tests/CompoundTests/OverrideColorTests.swift
index 6e78aa9b0..1d13b84da 100644
--- a/compound-ios/Tests/CompoundTests/OverrideColorTests.swift
+++ b/compound-ios/Tests/CompoundTests/OverrideColorTests.swift
@@ -10,7 +10,6 @@
 import Foundation
 import Testing
 
-@Suite
 struct OverrideColorTests {
     @Test("SwiftUI color override")
     func swiftUI() {
diff --git a/compound-ios/Tests/CompoundTests/PreviewTests.swift b/compound-ios/Tests/CompoundTests/PreviewTests.swift
index 84d7e7afc..55839434d 100644
--- a/compound-ios/Tests/CompoundTests/PreviewTests.swift
+++ b/compound-ios/Tests/CompoundTests/PreviewTests.swift
@@ -12,7 +12,6 @@ import Combine
 import SwiftUI
 import Testing
 
-@Suite
 struct PreviewTests {
     private struct SnapshotDevice {
         let name: String