Index: /trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 13079)
@@ -21,4 +21,5 @@
 import java.util.stream.Stream;
 
+import org.junit.Assume;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -329,3 +330,16 @@
         }
     }
+
+    /**
+     * Use to assume that EqualsVerifier is working with the current JVM.
+     */
+    public static void assumeWorkingEqualsVerifier() {
+        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();
+        } catch (IllegalArgumentException e) {
+            Assume.assumeNoException(e);
+        }
+    }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 13079)
@@ -64,4 +64,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(NodePair.class).usingGetClass()
             .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed
Index: /trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java	(revision 13079)
@@ -45,4 +45,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ExtensionFileFilter.class).usingGetClass()
             .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed
Index: /trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java	(revision 13079)
@@ -9,4 +9,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -131,4 +132,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(AddCommand.class).usingGetClass()
             .withPrefabValues(OsmPrimitive.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java	(revision 13079)
@@ -14,4 +14,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -285,4 +286,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java	(revision 13079)
@@ -14,4 +14,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -154,4 +155,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ChangeCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java	(revision 13079)
@@ -15,4 +15,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -125,4 +126,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ChangeNodesCommand.class).usingGetClass()
             .withPrefabValues(Way.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java	(revision 13079)
@@ -17,4 +17,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -278,4 +279,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ChangePropertyCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java	(revision 13079)
@@ -14,4 +14,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -149,4 +150,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ChangePropertyKeyCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java	(revision 13079)
@@ -13,4 +13,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -146,4 +147,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ChangeRelationMemberRoleCommand.class).usingGetClass()
             .withPrefabValues(Relation.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java	(revision 13079)
@@ -6,4 +6,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -38,4 +39,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(Command.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java	(revision 13079)
@@ -16,4 +16,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -378,4 +379,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(DeleteCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java	(revision 13079)
@@ -16,4 +16,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -260,4 +261,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MoveCommand.class).usingGetClass()
             .withPrefabValues(LatLon.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java	(revision 13079)
@@ -16,4 +16,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -145,4 +146,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(PurgeCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java	(revision 13079)
@@ -12,4 +12,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -123,4 +124,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(RemoveNodesCommand.class).usingGetClass()
             .withPrefabValues(Way.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java	(revision 13079)
@@ -11,4 +11,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -136,4 +137,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(RotateCommand.class).usingGetClass()
                 .withPrefabValues(LatLon.class, LatLon.ZERO, new LatLon(45, 45))
Index: /trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java	(revision 13079)
@@ -11,4 +11,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -136,4 +137,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ScaleCommand.class).usingGetClass()
             .withPrefabValues(LatLon.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java	(revision 13079)
@@ -13,4 +13,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -149,4 +150,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(SelectCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java	(revision 13079)
@@ -17,4 +17,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -214,4 +215,5 @@
     public void testEqualsContract() {
         DataSet ds = new DataSet();
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(SequenceCommand.class).usingGetClass()
             .withPrefabValues(Command.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -31,4 +32,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(TransformNodesCommand.class).usingGetClass()
             .withPrefabValues(LatLon.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 13079)
@@ -9,4 +9,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -73,4 +74,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass()
             .withPrefabValues(DataSet.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -32,4 +33,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 13079)
@@ -9,4 +9,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -90,4 +91,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(CoordinateConflictResolveCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,4 +34,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(DeletedStateConflictResolveCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,4 +34,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ModifiedConflictResolveCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,4 +34,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(RelationMemberConflictResolverCommand.class).usingGetClass()
             .withPrefabValues(Relation.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,4 +34,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(TagConflictResolveCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,4 +34,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(VersionConflictResolveCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -33,4 +34,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(WayNodesConflictResolverCommand.class).usingGetClass()
             .withPrefabValues(Conflict.class,
Index: /trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java	(revision 13079)
@@ -6,4 +6,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -29,4 +30,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(CachedLatLon.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 13079)
@@ -10,4 +10,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -146,4 +147,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(LatLon.class).usingGetClass()
             .withPrefabValues(DecimalFormat.class, new DecimalFormat("00.0"), new DecimalFormat("00.000"))
Index: /trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/correction/TagCorrectionTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -26,4 +27,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(TagCorrection.class).usingGetClass().verify();
     }
Index: /trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java	(revision 13079)
@@ -20,4 +20,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
@@ -445,4 +446,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(GpxData.class).usingGetClass()
             .withIgnoredFields("attr", "creator", "fromServer", "storageFile", "listeners", "tracks", "routes", "waypoints", "proxy")
Index: /trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -28,4 +29,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(GpxRoute.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegmentTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegmentTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegmentTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -27,4 +28,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ImmutableGpxTrackSegment.class).usingGetClass()
             .withIgnoredFields("bounds", "length")
Index: /trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -27,4 +28,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ImmutableGpxTrack.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java	(revision 13079)
@@ -6,4 +6,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -29,4 +30,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(WayPoint.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -27,4 +28,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(WithAttributes.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java	(revision 13079)
@@ -9,4 +9,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -58,4 +59,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(Note.class).usingGetClass()
             .withIgnoredFields("latLon", "createdAt", "closedAt", "state", "comments")
Index: /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java	(revision 13079)
@@ -9,4 +9,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -61,4 +62,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(OAuthParameters.class).usingGetClass().verify();
     }
Index: /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java	(revision 13079)
@@ -6,4 +6,5 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -34,4 +35,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(OAuthToken.class).usingGetClass().verify();
     }
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java	(revision 13079)
@@ -8,4 +8,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -32,4 +33,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(BBox.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 13079)
@@ -16,4 +16,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
@@ -242,4 +243,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(FilterPreferenceEntry.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -27,4 +28,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(Storage.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java	(revision 13079)
@@ -14,4 +14,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -96,4 +97,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(AutoCompletionPriority.class).usingGetClass()
             .verify();
Index: /trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -26,4 +27,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MapStatus.StatusTextHistory.class).withIgnoredFields("text").verify();
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java	(revision 13079)
@@ -9,4 +9,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.spi.preferences.StringSetting;
 
@@ -55,4 +56,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(PrefEntry.class).usingGetClass()
             .withIgnoredFields("value", "defaultValue", "isDefault", "changed")
Index: /trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager.UserInputTag;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -27,4 +28,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(UserInputTag.class).usingGetClass()
             .verify();
Index: /trunk/test/unit/org/openstreetmap/josm/gui/util/WindowGeometryTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/util/WindowGeometryTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/util/WindowGeometryTest.java	(revision 13079)
@@ -16,4 +16,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.util.WindowGeometry.WindowGeometryException;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -147,4 +148,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(WindowGeometry.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
Index: /trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java	(revision 13079)
@@ -14,4 +14,5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferenceTest;
 import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin;
@@ -40,4 +41,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(DeprecatedPlugin.class).usingGetClass().verify();
     }
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListListSettingTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25,4 +26,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ListListSetting.class).usingGetClass()
             .withIgnoredFields("isNew", "time")
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/ListSettingTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25,4 +26,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ListSetting.class).usingGetClass()
             .withIgnoredFields("isNew", "time")
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/MapListSettingTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25,4 +26,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MapListSetting.class).usingGetClass()
             .withIgnoredFields("isNew", "time")
Index: /trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/spi/preferences/StringSettingTest.java	(revision 13079)
@@ -4,4 +4,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25,4 +26,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(StringSetting.class).usingGetClass()
             .withIgnoredFields("isNew", "time")
Index: /trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java	(revision 13079)
@@ -8,6 +8,8 @@
 import java.util.HashSet;
 
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+
 import nl.jqno.equalsverifier.EqualsVerifier;
-import org.junit.Test;
 
 /**
@@ -21,4 +23,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MultiMap.class).usingGetClass().verify();
     }
Index: /trunk/test/unit/org/openstreetmap/josm/tools/PairTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/PairTest.java	(revision 13078)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/PairTest.java	(revision 13079)
@@ -3,4 +3,5 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -17,4 +18,5 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(Pair.class).suppress(Warning.NONFINAL_FIELDS).verify();
     }