Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 14122)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 14125)
@@ -151,5 +151,4 @@
     }
 
-    @SuppressWarnings("deprecation")
     private void setupGUI() {
         JOSMTestRules.cleanLayerEnvironment();
Index: trunk/test/unit/org/openstreetmap/josm/MainTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 14122)
+++ trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 14125)
@@ -2,12 +2,8 @@
 package org.openstreetmap.josm;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main.InitStatusListener;
-import org.openstreetmap.josm.Main.InitializationTask;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -35,34 +31,3 @@
         assertNotNull(CoordinateFormatManager.getDefaultFormat());
     }
-
-    private static class InitStatusListenerStub implements InitStatusListener {
-
-        boolean updated;
-        boolean finished;
-
-        @Override
-        public Object updateStatus(String event) {
-            updated = true;
-            return null;
-        }
-
-        @Override
-        public void finish(Object status) {
-            finished = true;
-        }
-    }
-
-    /**
-     * Unit test of {@link Main#setInitStatusListener}.
-     */
-    @Test
-    public void testSetInitStatusListener() {
-        InitStatusListenerStub listener = new InitStatusListenerStub();
-        Main.setInitStatusListener(listener);
-        assertFalse(listener.updated);
-        assertFalse(listener.finished);
-        new InitializationTask("", () -> { }).call();
-        assertTrue(listener.updated);
-        assertTrue(listener.finished);
-    }
 }
Index: trunk/test/unit/org/openstreetmap/josm/spi/lifecycle/LifecycleTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/spi/lifecycle/LifecycleTest.java	(revision 14125)
+++ trunk/test/unit/org/openstreetmap/josm/spi/lifecycle/LifecycleTest.java	(revision 14125)
@@ -0,0 +1,55 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.spi.lifecycle;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link Lifecycle} class.
+ */
+public class LifecycleTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform().https().devAPI().main().projection();
+
+    private static class InitStatusListenerStub implements InitStatusListener {
+
+        boolean updated;
+        boolean finished;
+
+        @Override
+        public Object updateStatus(String event) {
+            updated = true;
+            return null;
+        }
+
+        @Override
+        public void finish(Object status) {
+            finished = true;
+        }
+    }
+
+    /**
+     * Unit test of {@link Lifecycle#setInitStatusListener}.
+     */
+    @Test
+    public void testSetInitStatusListener() {
+        InitStatusListenerStub listener = new InitStatusListenerStub();
+        Lifecycle.setInitStatusListener(listener);
+        assertFalse(listener.updated);
+        assertFalse(listener.finished);
+        new InitializationTask("", () -> { }).call();
+        assertTrue(listener.updated);
+        assertTrue(listener.finished);
+    }
+}