Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 14603)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 14604)
@@ -23,5 +23,4 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -66,5 +65,4 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(NodePair.class).usingGetClass()
-            .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 14603)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MapStatusTest.java	(revision 14604)
@@ -9,5 +9,4 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -30,5 +29,4 @@
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(MapStatus.StatusTextHistory.class)
-            .suppress(Warning.ANNOTATION) // FIXME: To remove once https://github.com/jqno/equalsverifier/issues/197 is fixed
             .withIgnoredFields("text").verify();
     }
Index: trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java	(revision 14603)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java	(revision 14604)
@@ -18,4 +18,5 @@
 import mockit.Invocation;
 import mockit.Mock;
+import mockit.internal.reflection.FieldReflection;
 
 /**
@@ -157,5 +158,5 @@
                 final int mockResult = this.getMockResult(instance);
                 // TODO check validity of mockResult?
-                Deencapsulation.setField(instance, "result", mockResult);
+                FieldReflection.setField(instance.getClass(), instance, "result", mockResult);
                 Logging.info(
                     "{0} answering {1} to ExtendedDialog with content {2}",