--- old/test/lib/jdk/test/lib/Platform.java	2019-07-19 14:13:20.246381579 +0200
+++ new/test/lib/jdk/test/lib/Platform.java	2019-07-19 14:13:19.584380169 +0200
@@ -33,12 +33,15 @@
 import java.security.PrivilegedExceptionAction;
 
 public class Platform {
-    // Use this property to specify docker location on your system.
-    // E.g.: "/usr/local/bin/docker". We define this constant here so
-    // that it can be used in VMProps as well which checks docker support
-    // via this command
-    public static final String DOCKER_COMMAND =
-        System.getProperty("jdk.test.docker.command", "docker");
+
+    public static class Docker {
+        // Use this property to specify docker location on your system.
+        // E.g.: "/usr/local/bin/docker". We define this constant here so
+        // that it can be used in VMProps as well which checks docker support
+        // via this command
+        public static final String DOCKER_COMMAND =
+            System.getProperty("jdk.test.docker.command", "docker");
+    }
     public  static final String vmName      = privilegedGetProperty("java.vm.name");
     public  static final String vmInfo      = privilegedGetProperty("java.vm.info");
     private static final String osVersion   = privilegedGetProperty("os.version");