Index: /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 11250)
+++ /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 11251)
@@ -35,5 +35,5 @@
  */
 public class JOSMTestRules implements TestRule {
-    private int timeout = 10 * 1000;
+    private int timeout = isDebugMode() ? -1 : 10 * 1000;
     private TemporaryFolder josmHome;
     private boolean usePreferences = false;
@@ -60,5 +60,5 @@
      */
     public JOSMTestRules timeout(int millis) {
-        timeout = millis;
+        timeout = isDebugMode() ? -1 : millis;
         return this;
     }
@@ -353,3 +353,8 @@
         }
     }
+
+    private boolean isDebugMode() {
+        return java.lang.management.ManagementFactory.getRuntimeMXBean().
+                getInputArguments().toString().indexOf("-agentlib:jdwp") > 0;
+    }
 }