Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 10436)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 10441)
@@ -5,4 +5,5 @@
 import java.io.IOException;
 
+import org.junit.rules.DisableOnDebug;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
@@ -28,6 +29,5 @@
  */
 public class JOSMTestRules implements TestRule {
-    //We should make this the default when running from ant: Timeout.seconds(10);
-    private Timeout timeout = null;
+    private Timeout timeout = Timeout.seconds(10);
     private TemporaryFolder josmHome;
     private boolean usePreferences = false;
@@ -144,5 +144,5 @@
         };
         if (timeout != null) {
-            statement = timeout.apply(statement, description);
+            statement = new DisableOnDebug(timeout).apply(statement, description);
         }
         if (josmHome != null) {