--- a/jdk/test/ProblemList.txt	Fri Jul 24 20:45:30 2015 +0200
+++ b/jdk/test/ProblemList.txt	Fri Jul 24 15:28:59 2015 +0200
@@ -376,7 +376,4 @@
 # 8057732
 sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java    generic-all
 
-# 8064572 8060736 8062938
-sun/jvmstat/monitor/MonitoredVm/CR6672135.java			generic-all
-
 ############################################################################

--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java	Fri Jul 24 20:45:30 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2004, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.URISyntaxException;
-import java.util.Set;
-import sun.jvmstat.monitor.MonitorException;
-import sun.jvmstat.monitor.MonitoredHost;
-import sun.jvmstat.monitor.MonitoredVm;
-import sun.jvmstat.monitor.VmIdentifier;
-
-/**
- *
- * @test
- * @bug 6672135
- * @summary setInterval() for local MonitoredHost and local MonitoredVm
- * @author Tomas Hurka
- * @modules jdk.jvmstat/sun.jvmstat.monitor
- * @run main/othervm -XX:+UsePerfData CR6672135
- */
-public class CR6672135 {
-
-    private static final int INTERVAL = 2000;
-
-    public static void main(String[] args) {
-        int vmInterval;
-        int hostInterval;
-
-        try {
-            MonitoredHost localHost = MonitoredHost.getMonitoredHost("localhost");
-            Set vms = localHost.activeVms();
-            Integer vmInt =  (Integer) vms.iterator().next();
-            String uriString = "//" + vmInt + "?mode=r"; // NOI18N
-            VmIdentifier vmId = new VmIdentifier(uriString);
-            MonitoredVm vm = localHost.getMonitoredVm(vmId);
-
-            vm.setInterval(INTERVAL);
-            localHost.setInterval(INTERVAL);
-            vmInterval = vm.getInterval();
-            hostInterval = localHost.getInterval();
-        } catch (Exception ex) {
-            throw new Error ("Test failed",ex);
-        }
-        System.out.println("VM "+vmInterval);
-        if (vmInterval != INTERVAL) {
-            throw new Error("Test failed");
-        }
-        System.out.println("Host "+hostInterval);
-        if (hostInterval != INTERVAL) {
-            throw new Error("Test failed");
-        }
-    }
-}
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Fri Jul 24 15:28:59 2015 +0200
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2004, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.testlibrary.Asserts;
+import jdk.testlibrary.Utils;
+import jdk.test.lib.apps.LingeredApp;
+import sun.jvmstat.monitor.MonitorException;
+import sun.jvmstat.monitor.MonitoredHost;
+import sun.jvmstat.monitor.MonitoredVm;
+import sun.jvmstat.monitor.MonitoredVmUtil;
+import sun.jvmstat.monitor.VmIdentifier;
+
+/**
+ *
+ * @test
+ * @bug 6672135
+ * @summary setInterval() for local MonitoredHost and local MonitoredVm
+ * @modules jdk.jvmstat/sun.jvmstat.monitor
+ * @library /lib/testlibrary
+ * @library /../../test/lib/share/classes
+ * @build jdk.testlibrary.*
+ * @build jdk.test.lib.apps.*
+ * @run main TestPollingInterval
+ */
+public class TestPollingInterval {
+
+    private static final int INTERVAL = 2000;
+
+    public static void main(String[] args) throws IOException,
+            MonitorException, URISyntaxException {
+        LingeredApp app = null;
+        try {
+            List<String> vmArgs = new ArrayList<String>();
+            vmArgs.add("-XX:+UsePerfData");
+            vmArgs.addAll(Utils.getVmOptions());
+            app = LingeredApp.startApp(vmArgs);
+
+            MonitoredHost localHost = MonitoredHost.getMonitoredHost("localhost");
+            String uriString = "//" + app.getPid() + "?mode=r"; // NOI18N
+            VmIdentifier vmId = new VmIdentifier(uriString);
+            MonitoredVm vm = localHost.getMonitoredVm(vmId);
+            System.out.println("Monitored vm command line: " + MonitoredVmUtil.commandLine(vm));
+
+            vm.setInterval(INTERVAL);
+            localHost.setInterval(INTERVAL);
+
+            Asserts.assertEquals(vm.getInterval(), INTERVAL, "Monitored vm interval should be equal the test value");
+            Asserts.assertEquals(localHost.getInterval(), INTERVAL, "Monitored host interval should be equal the test value");
+        } finally {
+            LingeredApp.stopApp(app);
+        }
+
+    }
+
+}