diff --git a/app/autodiscovery/build.gradle b/app/autodiscovery/build.gradle
index 718ec0c884..7ad0357180 100644
--- a/app/autodiscovery/build.gradle
+++ b/app/autodiscovery/build.gradle
@@ -26,8 +26,7 @@ android {
 
     defaultConfig {
         minSdkVersion buildConfig.minSdk
-        // For Robolectric tests
-        targetSdkVersion 23
+        targetSdkVersion buildConfig.robolectricSdk
     }
 
     lintOptions {
diff --git a/app/core/build.gradle b/app/core/build.gradle
index cabdbe1126..50961c8844 100644
--- a/app/core/build.gradle
+++ b/app/core/build.gradle
@@ -42,8 +42,7 @@ android {
 
     defaultConfig {
         minSdkVersion buildConfig.minSdk
-        // For Robolectric tests
-        targetSdkVersion 22
+        targetSdkVersion buildConfig.robolectricSdk
     }
 
     lintOptions {
diff --git a/app/storage/build.gradle b/app/storage/build.gradle
index 06520eb152..2b17b69a99 100644
--- a/app/storage/build.gradle
+++ b/app/storage/build.gradle
@@ -26,8 +26,7 @@ android {
 
     defaultConfig {
         minSdkVersion buildConfig.minSdk
-        // For Robolectric tests
-        targetSdkVersion 22
+        targetSdkVersion buildConfig.robolectricSdk
     }
 
     lintOptions {
diff --git a/app/testing/build.gradle b/app/testing/build.gradle
index 2976a463c8..61fc019c17 100644
--- a/app/testing/build.gradle
+++ b/app/testing/build.gradle
@@ -19,8 +19,7 @@ android {
 
     defaultConfig {
         minSdkVersion buildConfig.minSdk
-        // For Robolectric tests
-        targetSdkVersion 22
+        targetSdkVersion buildConfig.robolectricSdk
     }
 
     lintOptions {
diff --git a/app/ui/build.gradle b/app/ui/build.gradle
index 08039235cb..ee4f482e4c 100644
--- a/app/ui/build.gradle
+++ b/app/ui/build.gradle
@@ -66,8 +66,7 @@ android {
 
     defaultConfig {
         minSdkVersion buildConfig.minSdk
-        // For Robolectric tests
-        targetSdkVersion 23
+        targetSdkVersion buildConfig.robolectricSdk
     }
 
     lintOptions {
diff --git a/app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt b/app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
index 8b3a05e512..005e67144b 100644
--- a/app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
+++ b/app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
@@ -5,6 +5,7 @@ import android.database.Cursor
 import android.database.MatrixCursor
 import android.text.Spannable
 import android.text.style.AbsoluteSizeSpan
+import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.CheckBox
@@ -50,7 +51,7 @@ private const val SECOND_LINE_DEFAULT_FONT_SIZE = 14f
 private const val DATE_DEFAULT_FONT_SIZE = 14f
 
 class MessageListAdapterTest : RobolectricTest() {
-    val context: Context = RuntimeEnvironment.application
+    val context: Context = ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_K9_Light)
     val testAccount = Account(SOME_ACCOUNT_UUID)
 
     val messageHelper: MessageHelper = mock {
diff --git a/build.gradle b/build.gradle
index 1c4e3dbcf9..55755f439f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,8 @@ buildscript {
         buildConfig = [
                 'compileSdk': 28,
                 'minSdk': 19,
-                'buildTools': '28.0.3'
+                'buildTools': '28.0.3',
+                'robolectricSdk': 28
         ]
 
         versions = [
@@ -28,7 +29,7 @@ buildscript {
 
                 'androidxTestRunner': '1.1.1',
                 'junit': '4.12',
-                'robolectric': '3.7.1',
+                'robolectric': '4.2.1',
                 'mockito': '2.18.0',
                 'mockitoKotlin': '1.5.0',
                 'truth': '0.35'