diff --git a/app/src/main/kotlin/io/element/android/x/root/RootView.kt b/app/src/main/kotlin/io/element/android/x/root/RootView.kt
index b767fb164f..534f7edfda 100644
--- a/app/src/main/kotlin/io/element/android/x/root/RootView.kt
+++ b/app/src/main/kotlin/io/element/android/x/root/RootView.kt
@@ -29,7 +29,7 @@ import io.element.android.x.features.rageshake.crash.ui.CrashDetectionEvents
 import io.element.android.x.features.rageshake.crash.ui.CrashDetectionView
 import io.element.android.x.features.rageshake.detection.RageshakeDetectionEvents
 import io.element.android.x.features.rageshake.detection.RageshakeDetectionView
-import io.element.android.x.tests.uitests.openShowkase
+import io.element.android.tests.uitests.openShowkase
 
 @Composable
 fun RootView(
diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts
index e8f2ca47ad..6d970e34b0 100644
--- a/tests/uitests/build.gradle.kts
+++ b/tests/uitests/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.x.tests.uitests"
+    namespace = "io.element.android.tests.uitests"
 }
 
 dependencies {
diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt
similarity index 94%
rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt
rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt
index 6250bcaba8..0c3fab67eb 100644
--- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ElementXShowkaseRootModule.kt
+++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ElementXShowkaseRootModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.tests.uitests
+package io.element.android.tests.uitests
 
 import com.airbnb.android.showkase.annotation.ShowkaseRoot
 import com.airbnb.android.showkase.annotation.ShowkaseRootModule
diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt
similarity index 96%
rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt
rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt
index ba8f111f13..9ae1b78577 100644
--- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseButton.kt
+++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseButton.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright (c) 2023 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.tests.uitests
+package io.element.android.tests.uitests
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
diff --git a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt
similarity index 94%
rename from tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt
rename to tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt
index 4ed7328ad3..bf252a1755 100644
--- a/tests/uitests/src/main/kotlin/io/element/android/x/tests/uitests/ShowkaseNavigation.kt
+++ b/tests/uitests/src/main/kotlin/io/element/android/tests/uitests/ShowkaseNavigation.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.tests.uitests
+package io.element.android.tests.uitests
 
 import android.app.Activity
 import com.airbnb.android.showkase.models.Showkase
diff --git a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt
index 994b65675a..e05cb7c971 100644
--- a/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt
+++ b/tests/uitests/src/test/kotlin/io/element/android/x/tests/uitests/ScreenshotTest.kt
@@ -37,6 +37,7 @@ import com.airbnb.android.showkase.models.Showkase
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterInjector
 import io.element.android.libraries.designsystem.ElementXTheme
+import io.element.android.libraries.tests.uitests.getMetadata
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith