--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/event/runtime/TestTableStatisticsEvent.java	Wed May 08 11:11:50 2019 -0500
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.runtime;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedClassLoader;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @key jfr
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @build jdk.jfr.event.runtime.TestClasses
+ * @run main/othervm jdk.jfr.event.runtime.TestTableStatisticsEvent
+ * @bug 8185525
+ */
+public final class TestTableStatisticsEvent {
+
+  public static void main(String[] args) throws Throwable {
+    try (Recording recording = new Recording()) {
+      recording.enable(EventNames.SymbolTableStatistics);
+      recording.enable(EventNames.StringTableStatistics);
+      recording.enable(EventNames.PlaceholderTableStatistics);
+      recording.enable(EventNames.LoaderConstraintsTableStatistics);
+      recording.enable(EventNames.ProtectionDomainCacheTableStatistics);
+      recording.start();
+      recording.stop();
+
+      List<RecordedEvent> events = Events.fromRecording(recording);
+      verifyTable(events, EventNames.SymbolTableStatistics);
+      verifyTable(events, EventNames.StringTableStatistics);
+      verifyTable(events, EventNames.PlaceholderTableStatistics);
+      verifyTable(events, EventNames.LoaderConstraintsTableStatistics);
+      verifyTable(events, EventNames.ProtectionDomainCacheTableStatistics);
+    }
+  }
+
+  private static void verifyTable(List<RecordedEvent> allEvents, String eventName) throws Exception {
+    List<RecordedEvent> eventsForTable = allEvents.stream().filter(e -> e.getEventType().getName().equals(eventName)).collect(Collectors.toList());
+    if (eventsForTable.isEmpty()) {
+      throw new Exception("No events for " + eventName);
+    }
+    for (RecordedEvent event : eventsForTable) {
+      Events.assertField(event, "bucketCount").atLeast(0L);
+      long entryCount = Events.assertField(event, "entryCount").atLeast(0L).getValue();
+      Events.assertField(event, "totalFootprint").atLeast(0L);
+      float averageBucketCount = Events.assertField(event, "bucketCountAverage").atLeast(0.0f).getValue();
+      Events.assertField(event, "bucketCountMaximum").atLeast((long)averageBucketCount);
+      Events.assertField(event, "bucketCountVariance").atLeast(0.0f);
+      Events.assertField(event, "bucketCountStandardDeviation").atLeast(0.0f);
+      float insertionRate = Events.assertField(event, "insertionRate").atLeast(0.0f).getValue();
+      float removalRate = Events.assertField(event, "removalRate").atLeast(0.0f).getValue();
+      if ((insertionRate > 0.0f) && (insertionRate > removalRate)) {
+        Asserts.assertGreaterThan(entryCount, 0L, "Entries marked as added, but no entries found for " + eventName);
+      }
+    }
+  }
+}