--- a/jdk/test/ProblemList.txt	Fri Mar 20 15:21:51 2015 -0700
+++ b/jdk/test/ProblemList.txt	Wed Mar 25 12:39:48 2015 +0100
@@ -136,13 +136,6 @@
 
 ############################################################################
 
-# jdk_management
-
-# 8058492
-java/lang/management/ThreadMXBean/FindDeadlocks.java                                      generic-all
-
-############################################################################
-
 # jdk_jmx
 
 # 8030957

--- a/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Fri Mar 20 15:21:51 2015 -0700
+++ b/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Wed Mar 25 12:39:48 2015 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 /*
  * @test
  * @bug     5086470
+ * @key intermittent
  * @summary Basic Test for the following methods:
  *          - ThreadMXBean.findDeadlockedThreads()
  *          - ThreadMXBean.findMonitorDeadlockedThreads()