--- old/test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java	2020-04-28 17:18:26.663720155 +0000
+++ new/test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java	2020-04-28 17:18:25.818273651 +0000
@@ -82,10 +82,8 @@
                 Events.assertField(event, "classCount").equal(2L);
                 Events.assertField(event, "chunkSize").above(1L);
                 Events.assertField(event, "blockSize").above(1L);
-                Events.assertField(event, "unsafeAnonymousClassCount").equal(2L);
-                Events.assertField(event, "unsafeAnonymousChunkSize").above(0L);
-                Events.assertField(event, "unsafeAnonymousBlockSize").above(0L);
-                Events.assertField(event, "hiddenClassCount").equal(2L);
+                // Hidden classes stats include both hidden and unsafe anonymous classes.
+                Events.assertField(event, "hiddenClassCount").equal(4L);
                 Events.assertField(event, "hiddenChunkSize").above(0L);
                 Events.assertField(event, "hiddenBlockSize").above(0L);
                 isAnyFound = true;