--- a/test/lib/jdk/test/lib/containers/docker/Common.java	Wed Mar 13 20:07:54 2019 +0100
+++ b/test/lib/jdk/test/lib/containers/docker/Common.java	Mon Nov 30 10:24:49 2020 +0100
@@ -53,7 +53,7 @@
     // create simple commonly used options
     public static DockerRunOptions newOpts(String imageNameAndTag) {
         return new DockerRunOptions(imageNameAndTag, "/jdk/bin/java", "-version")
-            .addJavaOpts("-Xlog:os+container=trace");
+            .addJavaOpts("-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintContainerInfo");
     }
 
 
@@ -62,7 +62,8 @@
         DockerRunOptions opts =
             new DockerRunOptions(imageNameAndTag, "/jdk/bin/java", testClass);
         opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/");
-        opts.addJavaOpts("-Xlog:os+container=trace", "-cp", "/test-classes/");
+        opts.addJavaOpts("-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintContainerInfo");
+        opts.addJavaOpts("-cp", "/test-classes/");
         return opts;
     }