diff --git a/browser/src/test/java/org/netbeans/html/presenters/browser/DumpStack.java b/browser/src/test/java/org/netbeans/html/presenters/browser/DumpStack.java
index d908dbc..86d4bc2 100644
--- a/browser/src/test/java/org/netbeans/html/presenters/browser/DumpStack.java
+++ b/browser/src/test/java/org/netbeans/html/presenters/browser/DumpStack.java
@@ -26,6 +26,7 @@
 
     private static final Timer TIMER = new Timer("Dump Stack Watchdog");
     private final long created = System.currentTimeMillis();
+    private int count = 5;
 
     @Override
     public void run() {
@@ -41,10 +42,14 @@
             }
         }
         System.err.println(sb.toString());
+        if (count-- < 0) {
+            System.err.println("DumpStack timeout. Exiting.");
+            System.exit(1);
+        }
     }
 
     public static void initialize() {
         final int minute = 60000;
-        TIMER.schedule(new DumpStack(), minute, 2 * minute);
+        TIMER.schedule(new DumpStack(), minute, minute);
     }
 }
diff --git a/generic/src/test/java/org/netbeans/html/presenters/spi/test/DumpStack.java b/generic/src/test/java/org/netbeans/html/presenters/spi/test/DumpStack.java
index 3f31f2b..f27f4da 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/DumpStack.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/DumpStack.java
@@ -26,6 +26,7 @@
 
     private static final Timer TIMER = new Timer("Dump Stack Watchdog");
     private final long created = System.currentTimeMillis();
+    private int count = 5;
 
     @Override
     public void run() {
@@ -41,10 +42,14 @@
             }
         }
         System.err.println(sb.toString());
+        if (count-- < 0) {
+            System.err.println("DumpStack timeout. Exiting.");
+            System.exit(1);
+        }
     }
 
     public static void initialize() {
         final int minute = 60000;
-        TIMER.schedule(new DumpStack(), minute, 2 * minute);
+        TIMER.schedule(new DumpStack(), minute, minute);
     }
 }
diff --git a/ko4j/src/test/java/org/netbeans/html/ko4j/DumpStack.java b/ko4j/src/test/java/org/netbeans/html/ko4j/DumpStack.java
index 9bc6dde..44b7031 100644
--- a/ko4j/src/test/java/org/netbeans/html/ko4j/DumpStack.java
+++ b/ko4j/src/test/java/org/netbeans/html/ko4j/DumpStack.java
@@ -26,6 +26,7 @@
 
     private static final Timer TIMER = new Timer("Dump Stack Watchdog");
     private final long created = System.currentTimeMillis();
+    private int count = 5 * 12;
 
     @Override
     public void run() {
@@ -41,6 +42,10 @@
             }
         }
         System.err.println(sb.toString());
+        if (count-- < 0) {
+            System.err.println("DumpStack timeout. Exiting.");
+            System.exit(1);
+        }
     }
 
     public static void initialize() {