diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt
similarity index 98%
rename from features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt
index bf8ab13bad..2c1611fec8 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt
@@ -1,18 +1,15 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.securityandprivacy.impl
+package io.element.android.features.securityandprivacy.impl.root
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyEvent
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyHistoryVisibility
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyPresenter
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyRoomAccess
+import io.element.android.features.securityandprivacy.impl.FakeSecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.featureflag.api.FeatureFlagService
@@ -214,7 +211,8 @@ class SecurityAndPrivacyPresenterTest {
     @Test
     fun `present - edit room address`() = runTest {
         val openEditRoomAddressLambda = lambdaRecorder<Unit> { }
-        val navigator = FakeSecurityAndPrivacyNavigator(openEditRoomAddressLambda = openEditRoomAddressLambda)
+        val navigator =
+            FakeSecurityAndPrivacyNavigator(openEditRoomAddressLambda = openEditRoomAddressLambda)
         val presenter = createSecurityAndPrivacyPresenter(navigator = navigator)
         presenter.test {
             skipItems(1)
@@ -439,7 +437,8 @@ class SecurityAndPrivacyPresenterTest {
     @Test
     fun `present - SelectSpaceMemberAccess with multiple spaces opens ManageAuthorizedSpaces`() = runTest {
         val openManageAuthorizedSpacesLambda = lambdaRecorder<Boolean, Unit> { }
-        val navigator = FakeSecurityAndPrivacyNavigator(openManageAuthorizedSpacesLambda = openManageAuthorizedSpacesLambda)
+        val navigator =
+            FakeSecurityAndPrivacyNavigator(openManageAuthorizedSpacesLambda = openManageAuthorizedSpacesLambda)
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
                 roomPermissions = roomPermissions(),
@@ -607,7 +606,8 @@ class SecurityAndPrivacyPresenterTest {
     @Test
     fun `present - SelectAskToJoinWithSpaceMembersAccess with multiple spaces opens ManageAuthorizedSpaces`() = runTest {
         val openManageAuthorizedSpacesLambda = lambdaRecorder<Boolean, Unit> { }
-        val navigator = FakeSecurityAndPrivacyNavigator(openManageAuthorizedSpacesLambda = openManageAuthorizedSpacesLambda)
+        val navigator =
+            FakeSecurityAndPrivacyNavigator(openManageAuthorizedSpacesLambda = openManageAuthorizedSpacesLambda)
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
                 roomPermissions = roomPermissions(),
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt
similarity index 90%
rename from features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt
index 7cd9b154cf..a1f46b2938 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.securityandprivacy.impl
+package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -14,14 +13,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyEvent
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyHistoryVisibility
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyRoomAccess
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyState
-import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyView
-import io.element.android.features.securityandprivacy.impl.root.SpaceSelectionMode
-import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacySettings
-import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacyState
+import io.element.android.features.securityandprivacy.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -222,7 +214,9 @@ class SecurityAndPrivacyViewTest {
         )
         rule.setSecurityAndPrivacyView(state)
         // The footer text uses AnnotatedString with a link. Verify the footer text is displayed.
-        rule.onNodeWithText("Choose which spaces", substring = true).assertExists()
+        val actionFooterText = rule.activity.getString(R.string.screen_security_and_privacy_room_access_footer_manage_spaces_action)
+        val footerText = rule.activity.getString(R.string.screen_security_and_privacy_room_access_footer, actionFooterText)
+        rule.onNodeWithText(footerText).assertExists()
     }
 }