diff --git a/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java b/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java
index ee9864db..450a456c 100644
--- a/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java
+++ b/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java
@@ -246,10 +246,13 @@ public void filter_removesEmptyPackagesTypesAndEntries() throws Exception {
   public void resourcesLocaleConversions_oldLanguageCodes() {
     // This documents that our converter will use old ISO-639 language codes for backward
     // compatibility.
+    // Since Java SE 17, this is no longer the case.
 
-    assertThat(ResourcesUtils.convertLocaleToLanguage("he")).isEqualTo("iw");
-    assertThat(ResourcesUtils.convertLocaleToLanguage("yi")).isEqualTo("ji");
-    assertThat(ResourcesUtils.convertLocaleToLanguage("id")).isEqualTo("in");
+    if (System.getProperty("java.version").compareTo("17") < 0) {
+      assertThat(ResourcesUtils.convertLocaleToLanguage("he")).isEqualTo("iw");
+      assertThat(ResourcesUtils.convertLocaleToLanguage("yi")).isEqualTo("ji");
+      assertThat(ResourcesUtils.convertLocaleToLanguage("id")).isEqualTo("in");
+    }
   }
 
   @Test