Index: trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 12439)
+++ trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 12444)
@@ -12,5 +12,4 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -43,5 +42,5 @@
 
     /**
-     * Unit test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases.
+     * Unit test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases for TMS.
      */
     @Test
@@ -51,15 +50,5 @@
         List<TMSLayer> tmsLayers = Main.getLayerManager().getLayersOfType(TMSLayer.class);
         assertEquals(1, tmsLayers.size());
-
-        try {
-            new AddImageryLayerAction(new ImageryInfo("wms.openstreetmap.fr", "http://wms.openstreetmap.fr/wms?",
-                    "wms_endpoint", null, null)).actionPerformed(null);
-            List<WMSLayer> wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class);
-            assertEquals(1, wmsLayers.size());
-
-            Main.getLayerManager().removeLayer(wmsLayers.get(0));
-        } finally {
-            Main.getLayerManager().removeLayer(tmsLayers.get(0));
-        }
+        Main.getLayerManager().removeLayer(tmsLayers.get(0));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java	(revision 12444)
+++ trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTestIT.java	(revision 12444)
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link AddImageryLayerAction}.
+ */
+public final class AddImageryLayerActionTestIT {
+    /**
+     * We need prefs for this. We need platform for actions and the OSM API for checking blacklist.
+     * The timeout is set to default httpclient read timeout + connect timeout + a small delay to ignore
+     * common but harmless network issues.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform().fakeAPI().timeout(45500);
+
+    /**
+     * Integration test of {@link AddImageryLayerAction#actionPerformed} - Enabled cases for WMS.
+     */
+    @Test
+    public void testActionPerformedEnabledWms() {
+        new AddImageryLayerAction(new ImageryInfo("wms.openstreetmap.fr", "http://wms.openstreetmap.fr/wms?",
+                "wms_endpoint", null, null)).actionPerformed(null);
+        List<WMSLayer> wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class);
+        assertEquals(1, wmsLayers.size());
+
+        Main.getLayerManager().removeLayer(wmsLayers.get(0));
+    }
+}