--- old/src/hotspot/share/gc/z/z_globals.hpp	2020-02-20 09:02:43.641609236 +0100
+++ new/src/hotspot/share/gc/z/z_globals.hpp	2020-02-20 09:02:43.287602112 +0100
@@ -51,6 +51,9 @@
   experimental(uint, ZCollectionInterval, 0,                                \
           "Force GC at a fixed time interval (in seconds)")                 \
                                                                             \
+  experimental(bool, ZProactive, true,                                      \
+          "Enable proactive GC cycles")                                     \
+                                                                            \
   experimental(bool, ZUncommit, true,                                       \
           "Uncommit unused memory")                                         \
                                                                             \
@@ -62,9 +65,6 @@
           "Time between statistics print outs (in seconds)")                \
           range(1, (uint)-1)                                                \
                                                                             \
-  diagnostic(bool, ZProactive, true,                                        \
-          "Enable proactive GC cycles")                                     \
-                                                                            \
   diagnostic(bool, ZVerifyViews, false,                                     \
           "Verify heap view accesses")                                      \
                                                                             \
--- old/test/hotspot/jtreg/gc/z/TestHighUsage.java	2020-02-20 09:02:44.081618091 +0100
+++ new/test/hotspot/jtreg/gc/z/TestHighUsage.java	2020-02-20 09:02:43.750611430 +0100
@@ -87,7 +87,6 @@
     public static void main(String[] args) throws Exception {
         ProcessTools.executeTestJvm(new String[]{ "-XX:+UnlockExperimentalVMOptions",
                                                   "-XX:+UseZGC",
-                                                  "-XX:+UnlockDiagnosticVMOptions",
                                                   "-XX:-ZProactive",
                                                   "-Xms128M",
                                                   "-Xmx128M",