diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index cef752cd88e3..bd12c2afb2f3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -4,6 +4,7 @@
 
 25.5
 -----
+- [*****] [Internal] Updated the app's target SDK to Android 17 (API 37) [https://github.com/woocommerce/woocommerce-android/pull/16413]
 - [*] The Pay In Person toggle on the Payments screen no longer looks turned off when its status could not be loaded
 - [Internal] Woo POS: every POS analytics event now carries device_type (phone/tablet) and entry_point, so POS usage can be split by form factor and attributed to where POS was opened from [https://github.com/woocommerce/woocommerce-android/pull/16414]
 - [*] Woo POS: Remote Tap to Pay failures now explain what went wrong - phone not eligible for Tap to Pay, NFC turned off, or a payment service error - instead of a generic message or raw error text [https://github.com/woocommerce/woocommerce-android/pull/16384]
diff --git a/WooCommerce/src/test/resources/robolectric.properties b/WooCommerce/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/WooCommerce/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/libs/ai-assistant/feature/src/test/resources/robolectric.properties b/libs/ai-assistant/feature/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/libs/ai-assistant/feature/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/libs/fluxc-plugin/src/test/resources/robolectric.properties b/libs/fluxc-plugin/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/libs/fluxc-plugin/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/libs/fluxc-tests/src/test/resources/robolectric.properties b/libs/fluxc-tests/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/libs/fluxc-tests/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/libs/fluxc/src/test/resources/robolectric.properties b/libs/fluxc/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/libs/fluxc/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/libs/login/src/test/resources/robolectric.properties b/libs/login/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/libs/login/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/libs/store-design-system/src/test/resources/robolectric.properties b/libs/store-design-system/src/test/resources/robolectric.properties
new file mode 100644
index 000000000000..9368fbfac563
--- /dev/null
+++ b/libs/store-design-system/src/test/resources/robolectric.properties
@@ -0,0 +1,3 @@
+# Robolectric 4.16.1 supports up to SDK 36. Pin tests to 36 so they keep running there
+# after the app's targetSdkVersion was bumped to 37 (Android 17), which Robolectric can't emulate yet.
+sdk=36
diff --git a/settings.gradle b/settings.gradle
index 18c7b7ef4cf1..a932bcae1034 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -211,7 +211,7 @@ gradle.ext.mediaPickerSourceCameraBinaryPath = "org.wordpress.mediapicker:source
 
 gradle.ext {
     compileSdkVersion = 37
-    targetSdkVersion = 36
+    targetSdkVersion = 37
     minSdkVersion = 26
 }