diff --git a/AnkiDroid/src/main/res/layout/fragment_reminder_troubleshooting.xml b/AnkiDroid/src/main/res/layout/fragment_reminder_troubleshooting.xml
index 947b73ce05db..e19351ce4b70 100644
--- a/AnkiDroid/src/main/res/layout/fragment_reminder_troubleshooting.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_reminder_troubleshooting.xml
@@ -16,7 +16,7 @@
         app:navigationContentDescription="@string/abc_action_bar_up_description"
         app:title="Troubleshooting" />
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -100,6 +100,6 @@
             </LinearLayout>
         </LinearLayout>
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt
new file mode 100644
index 000000000000..11b5b4df6d28
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.reviewreminders
+
+import androidx.fragment.app.commit
+import androidx.recyclerview.widget.ListAdapter
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.databinding.FragmentReminderTroubleshootingBinding
+import com.ichi2.anki.reviewreminders.ScheduleRemindersFragment.FragmentHost
+import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
+import com.ichi2.utils.dp
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.greaterThanOrEqualTo
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RuntimeEnvironment
+
+/**
+ * Layout of [ReminderTroubleshootingFragment]'s checks list, which is nested inside a scroll
+ * container and must be measured at its full content height.
+ */
+@RunWith(AndroidJUnit4::class)
+class ReminderTroubleshootingLayoutTest : RobolectricTest() {
+    /** The minimum height of a check item, from the item layout XML */
+    private val checkItemMinHeight = 72.dp
+
+    @Test
+    fun `all checks are displayed when the list overflows the screen`() {
+        // landscape: the checks list is much taller than the scroll viewport
+        RuntimeEnvironment.setQualifiers("+land")
+        val checks =
+            listOf(
+                TroubleshootingCheck.NotificationPermission(CheckResult.Failed),
+                TroubleshootingCheck.NotificationChannelEnabled(CheckResult.Failed),
+                TroubleshootingCheck.DoNotDisturbOff(CheckResult.Warning),
+                TroubleshootingCheck.UnrestrictedOptimizationEnabled(CheckResult.Failed),
+                TroubleshootingCheck.PowerSavingModeOff(CheckResult.Warning),
+                TroubleshootingCheck.ExactAlarmPermission(CheckResult.Warning),
+            )
+
+        withReviewRemindersTroubleshooting {
+            @Suppress("UNCHECKED_CAST")
+            (checksList.adapter as ListAdapter<TroubleshootingCheck, *>).submitList(checks)
+            advanceRobolectricLooper()
+
+            val itemCount = checksList.adapter!!.itemCount
+            assertThat(
+                "sanity: enough checks to overflow the landscape viewport",
+                itemCount,
+                greaterThanOrEqualTo(4),
+            )
+            assertThat(
+                "every check has a laid-out item",
+                checksList.childCount,
+                equalTo(itemCount),
+            )
+            assertThat(
+                "the list is at least as tall as its items' minimum heights",
+                checksList.height,
+                greaterThanOrEqualTo(itemCount * checkItemMinHeight.toPx(targetContext)),
+            )
+        }
+    }
+
+    /**
+     * Launches [ReminderTroubleshootingFragment] in a standalone activity and runs [block] on
+     * its binding
+     */
+    private fun withReviewRemindersTroubleshooting(block: FragmentReminderTroubleshootingBinding.() -> Unit) {
+        val intent = ScheduleRemindersFragment.getIntent(targetContext, ReviewReminderScope.Global)
+        ActivityScenario.launch<ConfigAwareSingleFragmentActivity>(intent).use { scenario ->
+            advanceRobolectricLooper()
+            scenario.onActivity { activity ->
+                activity.supportFragmentManager.commit {
+                    replace(
+                        R.id.fragment_container,
+                        ReminderTroubleshootingFragment.newInstance(FragmentHost.STANDALONE_ACTIVITY),
+                    )
+                }
+                advanceRobolectricLooper()
+
+                val binding =
+                    FragmentReminderTroubleshootingBinding.bind(
+                        activity.supportFragmentManager
+                            .findFragmentById(R.id.fragment_container)!!
+                            .requireView(),
+                    )
+                binding.block()
+            }
+        }
+    }
+}