Index: /trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java	(revision 14186)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java	(revision 14187)
@@ -50,8 +50,4 @@
     @Before
     public void bootStrap() {
-        new JOptionPaneSimpleMocker(ImmutableMap.of(
-            "A background upload is already in progress. Kindly wait for it to finish before uploading new changes", JOptionPane.OK_OPTION
-        ));
-
         DataSet dataSet = new DataSet();
         Node node1 = new Node();
@@ -82,5 +78,7 @@
         strategy = null;
         changeset = null;
-        uploadPrimitivesTask.cancel();
+        if (uploadPrimitivesTask != null) {
+            uploadPrimitivesTask.cancel();
+        }
         uploadPrimitivesTask = null;
     }
@@ -92,4 +90,7 @@
     public void testSingleUploadInstance() {
         TestUtils.assumeWorkingJMockit();
+        new JOptionPaneSimpleMocker(ImmutableMap.of(
+                "A background upload is already in progress. Kindly wait for it to finish before uploading new changes", JOptionPane.OK_OPTION
+            ));
         Optional<AsynchronousUploadPrimitivesTask> task = AsynchronousUploadPrimitivesTask.
                 createAsynchronousUploadTask(strategy, layer, toUpload, changeset);