Index: trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 18433)
+++ trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 18434)
@@ -64,5 +64,4 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.github.classgraph.ClassGraph;
@@ -492,12 +491,17 @@
     @SuppressWarnings("null")
     public static void assumeWorkingEqualsVerifier() {
-        if (Utils.getJavaVersion() >= 16) {
+        // See https://github.com/raphw/byte-buddy/blob/master/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
+        // for currently supported Java versions.
+        if (Utils.getJavaVersion() >= 19) {
             // Byte Buddy often supports new class file versions for current EA releases if its experimental flag is set to true
             System.setProperty("net.bytebuddy.experimental", "true");
+        } else {
+            return;
         }
         try {
             // Workaround to https://github.com/jqno/equalsverifier/issues/177
             // Inspired by https://issues.apache.org/jira/browse/SOLR-11606
-            nl.jqno.equalsverifier.internal.lib.bytebuddy.ClassFileVersion.ofThisVm();
+            // Note: if we change to the equalsverifier fat jar, use nl.jqno.equalsverifier.internal.lib instead of net
+            net.bytebuddy.ClassFileVersion.ofThisVm();
         } catch (IllegalArgumentException e) {
             assumeFalse(e != null);