Index: trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java	(revision 10065)
+++ trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java	(revision 10067)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.tools.bugreport;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
@@ -18,5 +19,5 @@
     @Before
     public void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
     }
 
@@ -26,5 +27,22 @@
     @Test
     public void testBuildPanel() {
-        assertNotNull(BugReportExceptionHandler.buildPanel(new Exception()));
+        assertNotNull(BugReportExceptionHandler.buildPanel(new Exception("testBuildPanel")));
+    }
+
+    /**
+     * Unit test for {@link BugReportExceptionHandler.BugReporterThread#askForBugReport} method.
+     */
+    @Test
+    public void testAskForBugReport() {
+        BugReportExceptionHandler.BugReporterThread.askForBugReport(new Exception("testAskForBugReport"));
+    }
+
+    /**
+     * Unit test for {@link BugReportExceptionHandler#handleException} method.
+     */
+    @Test
+    public void testHandleException() {
+        BugReportExceptionHandler.handleException(new Exception("testHandleException"));
+        assertFalse(BugReportExceptionHandler.exceptionHandlingInProgress());
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSenderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSenderTest.java	(revision 10067)
+++ trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportSenderTest.java	(revision 10067)
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools.bugreport;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.actions.ShowStatusReportAction;
+
+/**
+ * Unit tests of {@link BugReportSender} class.
+ */
+public class BugReportSenderTest {
+
+    /**
+     * Setup tests.
+     */
+    @Before
+    public void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test for {@link BugReportSender#BugReportSender}.
+     * @throws InterruptedException if the thread is interrupted
+     */
+    @Test
+    public void testBugReportSender() throws InterruptedException {
+        BugReportSender sender = BugReportSender.reportBug(ShowStatusReportAction.getReportHeader());
+        assertNotNull(sender);
+        synchronized (sender) {
+            while (sender.isAlive()) {
+                sender.wait();
+            }
+        }
+        assertFalse(sender.isAlive());
+        assertNull(sender.getErrorMessage(), sender.getErrorMessage());
+    }
+}