diff --git a/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt
index 1dc8930ab5..111f50081b 100644
--- a/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt
+++ b/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt
@@ -23,8 +23,11 @@ import android.os.LocaleList
 import androidx.activity.OnBackPressedDispatcher
 import androidx.activity.OnBackPressedDispatcherOwner
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
@@ -108,7 +111,7 @@ class ScreenshotTest {
                 }
             ) {
                 ElementXTheme(darkTheme = (theme == "dark")) {
-                    Box {
+                    Box(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
                         componentTestPreview.Content()
                     }
                 }
diff --git a/tests/uitests/src/test/java/io/element/android/x/tests/uitests/TypographyTestPreview.kt b/tests/uitests/src/test/java/io/element/android/x/tests/uitests/TypographyTestPreview.kt
index e2d439b9e0..1ed2c9664b 100644
--- a/tests/uitests/src/test/java/io/element/android/x/tests/uitests/TypographyTestPreview.kt
+++ b/tests/uitests/src/test/java/io/element/android/x/tests/uitests/TypographyTestPreview.kt
@@ -19,11 +19,12 @@ package io.element.android.x.tests.uitests
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicText
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.airbnb.android.showkase.models.ShowkaseBrowserTypography
 import com.airbnb.android.showkase.ui.padding4x
-import java.util.*
+import java.util.Locale
 
 class TypographyTestPreview(
     private val showkaseBrowserTypography: ShowkaseBrowserTypography
@@ -37,7 +38,9 @@ class TypographyTestPreview(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(padding4x),
-            style = showkaseBrowserTypography.textStyle
+            style = showkaseBrowserTypography.textStyle.copy(
+                color = MaterialTheme.colorScheme.onBackground
+            )
         )
     }