diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 6ad85876d08..9d8ef17b5fd 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -830,9 +830,6 @@ java/nio/channels/ServerSocketChannel/AdaptServerSocket.java 	windows-all
 java/nio/channels/SocketChannel/ConnectState.java	 	windows-all
 java/nio/channels/SocketChannel/FinishConnect.java	 	windows-all
 
-# Need to be marked othervm, or changed to be samevm safe
-java/nio/channels/SocketChannel/OpenLeak.java			generic-all
-
 # Gets java.net.BindException alot (static port number?)
 java/nio/channels/SocketChannel/VectorIO.java		 	generic-all
 
diff --git a/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java b/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java
index 9e9e6f1d08f..ab5dfde6922 100644
--- a/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java
+++ b/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java
@@ -25,6 +25,8 @@
  * @bug 6548464
  * @summary SocketChannel.open(SocketAddress) leaks file descriptor if
  *     connection cannot be established
+ * @build OpenLeak
+ * @run main/othervm OpenLeak
  */
 
 import java.net.InetAddress;