diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
index 2b1fc6b36..139900fab 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
@@ -53,6 +53,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.toUpperCase
@@ -197,7 +198,8 @@ fun DefaultCameraFacing(
         }
     )
     SwitchSettingUI(
-        modifier = modifier.testTag(BTN_SWITCH_SETTING_LENS_FACING_TAG)
+        modifier = modifier
+            .testTag(BTN_SWITCH_SETTING_LENS_FACING_TAG)
             .semantics {
                 stateDescription = description
             },
@@ -241,6 +243,7 @@ fun FlashModeSetting(
                     id = R.string.flash_mode_description_llb
                 )
             }
+
             is FlashUiState.Disabled -> stringResource(
                 flashUiState.disabledRationale.reasonTextResId,
                 stringResource(flashUiState.disabledRationale.affectedSettingNameResId)
@@ -306,8 +309,12 @@ fun AspectRatioSetting(
                     id = R.string.aspect_ratio_description_9_16
                 )
 
-                AspectRatio.THREE_FOUR -> stringResource(id = R.string.aspect_ratio_description_3_4)
-                AspectRatio.ONE_ONE -> stringResource(id = R.string.aspect_ratio_description_1_1)
+                AspectRatio.THREE_FOUR -> stringResource(
+                    id = R.string.aspect_ratio_description_3_4
+                )
+                AspectRatio.ONE_ONE -> stringResource(
+                    id = R.string.aspect_ratio_description_1_1
+                )
             }
         } else {
             TODO("aspect ratio currently has no disabled criteria")
@@ -842,9 +849,11 @@ fun RecordingAudioSetting(
             is AudioUiState.Enabled.On -> {
                 stringResource(R.string.audio_selector_on)
             }
+
             is AudioUiState.Enabled.Mute -> {
                 stringResource(R.string.audio_selector_off)
             }
+
             is AudioUiState.Disabled -> {
                 disabledRationaleString(disabledRationale = audioUiState.disabledRationale)
             }
@@ -905,6 +914,7 @@ fun BasicPopupSetting(
     )
     if (popupStatus.value) {
         AlertDialog(
+            modifier = Modifier.semantics { testTagsAsResourceId = true },
             onDismissRequest = { popupStatus.value = false },
             confirmButton = {
                 Text(