diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
index 0b67980f09..3dfb1b1a25 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
@@ -57,8 +57,8 @@ import io.element.android.x.core.compose.textFieldState
 import io.element.android.x.designsystem.components.VectorIcon
 import io.element.android.x.features.login.R
 import io.element.android.x.features.login.error.changeServerError
-import io.element.android.x.testtags.TestTags
-import io.element.android.x.testtags.testTag
+import io.element.android.x.libraries.testtags.TestTags
+import io.element.android.x.libraries.testtags.testTag
 
 @Composable
 fun ChangeServerView(
diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
index f5ed8f0883..67a9f19d31 100644
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
@@ -60,9 +60,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.x.core.compose.textFieldState
 import io.element.android.x.features.login.error.loginError
+import io.element.android.x.libraries.testtags.TestTags
+import io.element.android.x.libraries.testtags.testTag
 import io.element.android.x.matrix.core.SessionId
-import io.element.android.x.testtags.TestTags
-import io.element.android.x.testtags.testTag
 import io.element.android.x.ui.strings.R as StringR
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt
index 740598ed69..138840e222 100644
--- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt
+++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt
@@ -50,8 +50,8 @@ import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.HorizontalPagerIndicator
 import com.google.accompanist.pager.rememberPagerState
 import io.element.android.x.designsystem.components.VectorButton
-import io.element.android.x.testtags.TestTags
-import io.element.android.x.testtags.testTag
+import io.element.android.x.libraries.testtags.TestTags
+import io.element.android.x.libraries.testtags.testTag
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import io.element.android.x.ui.strings.R as StringR
diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts
index 8f62664002..21e6f2a384 100644
--- a/libraries/testtags/build.gradle.kts
+++ b/libraries/testtags/build.gradle.kts
@@ -19,5 +19,5 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.x.testtags"
+    namespace = "io.element.android.x.libraries.testtags"
 }
diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt
similarity index 95%
rename from libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt
rename to libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt
index fa35045439..5d75a31674 100644
--- a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/Compose.kt
+++ b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.testtags
+package io.element.android.x.libraries.testtags
 
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt
similarity index 90%
rename from libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt
rename to libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt
index 40d70bc3ce..1e96c61373 100644
--- a/libraries/testtags/src/main/kotlin/io/element/android/x/testtags/TestTags.kt
+++ b/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package io.element.android.x.testtags
+package io.element.android.x.libraries.testtags
 
 @JvmInline
 value class TestTag internal constructor(val value: String)
 
 object TestTags {
     /**
-     * OnBoarding screen
+     * OnBoarding screen.
      */
     val onBoardingSignIn = TestTag("onboarding-sign_in")
 
     /**
-     * Login screen
+     * Login screen.
      */
     val loginChangeServer = TestTag("login-change_server")
     val loginEmailUsername = TestTag("login-email_username")
@@ -34,7 +34,7 @@ object TestTags {
     val loginContinue = TestTag("login-continue")
 
     /**
-     * Change server screen
+     * Change server screen.
      */
     val changeServerServer = TestTag("change_server-server")
     val changeServerContinue = TestTag("change_server-continue")