diff -r f7bdeeb2ca57 -r a8ec88e2d76f jdk/test/java/util/logging/LoggingDeadlock2.java
--- a/jdk/test/java/util/logging/LoggingDeadlock2.java	Wed Jul 09 12:30:17 2014 +0200
+++ b/jdk/test/java/util/logging/LoggingDeadlock2.java	Wed Jul 09 17:51:50 2014 +0200
@@ -28,7 +28,7 @@
  * @author  Serguei Spitsyn / Hitachi / Martin Buchholz
  *
  * @build    LoggingDeadlock2
- * @run  main/timeout=15 LoggingDeadlock2
+ * @run  main LoggingDeadlock2
  *
  * There is a clear deadlock between LogManager.<clinit> and
  * Cleaner.run() methods.