--- old/test/jdk/jdk/net/Sockets/policy.fail	2018-08-31 11:36:23.000000000 -0700
+++ new/test/jdk/jdk/net/Sockets/policy.fail	2018-08-31 11:36:22.000000000 -0700
@@ -1,17 +1,10 @@
-grant {
-    permission java.util.PropertyPermission "java.vm.name", "read";
-    permission java.util.PropertyPermission "java.vm.info", "read";
-    permission java.util.PropertyPermission "os.version", "read";
-    permission java.util.PropertyPermission "sun.arch.data.model", "read";
-    permission java.util.PropertyPermission "java.vm.version", "read";
-    permission java.util.PropertyPermission "jdk.debug", "read";
-    permission java.util.PropertyPermission "os.arch", "read";
-    permission java.util.PropertyPermission "os.name", "read";
-    permission java.util.PropertyPermission "user.name", "read";
-    permission java.util.PropertyPermission "sun.management.compiler", "read";
-    permission java.io.FilePermission "<<ALL FILES>>", "execute";
-    permission java.util.PropertyPermission "line.separator", "read";
+grant codeBase "file:${test.classes}/../../../../test/lib/-" {
+    permission java.util.PropertyPermission "*", "read";
     permission java.io.FilePermission "/etc/release", "read";
-    permission java.net.SocketPermission "127.0.0.1", "connect,accept" ;
-    permission java.net.SocketPermission "localhost", "listen" ;
+    permission java.io.FilePermission "<<ALL FILES>>", "execute";
+};
+
+grant codeBase "file:${test.classes}/*" {
+    permission java.net.SocketPermission "127.0.0.1", "connect,accept";
+    permission java.net.SocketPermission "localhost", "listen";
 };