Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 17531)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 17532)
@@ -643,5 +643,9 @@
         SelectionEventManager eventManager = SelectionEventManager.getInstance();
         MainApplication.getLayerManager().resetState();
-        eventManager.resetState();
+        try {
+            eventManager.resetState();
+        } catch (IllegalArgumentException ignored) {
+            Logging.trace(ignored);
+        }
     }