Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 13994)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 14004)
@@ -66,5 +66,5 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(NodePair.class).usingGetClass()
-            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed
+            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/197 is fixed
             .withPrefabValues(Node.class, new Node(1), new Node(2))
             .verify();
Index: trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 13994)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 14004)
@@ -9,4 +9,5 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -28,5 +29,7 @@
     public void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
-        EqualsVerifier.forClass(MapStatus.StatusTextHistory.class).withIgnoredFields("text").verify();
+        EqualsVerifier.forClass(MapStatus.StatusTextHistory.class)
+            .suppress(Warning.ANNOTATION) // FIXME: To remove once https://github.com/jqno/equalsverifier/issues/197 is fixed
+            .withIgnoredFields("text").verify();
     }
 }