--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java	Fri Dec 01 18:19:39 2017 +0530
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 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.
+ *
+ * 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.
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import jdk.test.lib.apps.LingeredApp;
+
+/*
+ * @test
+ * @bug 8191538
+ * @summary Test clhsdb 'vmstructsdump' command
+ * @library /test/lib
+ * @run main/othervm ClhsdbVmStructsDump
+ */
+
+public class ClhsdbVmStructsDump {
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("Starting ClhsdbVmStructsDump test");
+
+        LingeredApp theApp = null;
+        try {
+            ClhsdbLauncher test = new ClhsdbLauncher();
+            theApp = LingeredApp.startApp();
+            System.out.println("Started LingeredApp with pid " + theApp.getPid());
+
+            List<String> cmds = List.of("vmstructsdump");
+
+            Map<String, List<String>> expStrMap = new HashMap<>();
+            expStrMap.put("vmstructsdump", List.of(
+                "field ConstantPool _pool_holder InstanceKlass*",
+                "field InstanceKlass _methods Array<Method*>*",
+                "field InstanceKlass _constants ConstantPool*",
+                "field Klass _name Symbol*",
+                "type ClassLoaderData* null",
+                "type DictionaryEntry KlassHashtableEntry",
+                "field JavaThread _next JavaThread*",
+                "field JavaThread _osthread OSThread*",
+                "type TenuredGeneration CardGeneration",
+                "field JVMState _bci",
+                "type Universe null",
+                "type ConstantPoolCache MetaspaceObj"));
+            test.run(theApp.getPid(), cmds, expStrMap, null);
+        } catch (Exception ex) {
+            throw new RuntimeException("Test ERROR " + ex, ex);
+        } finally {
+            LingeredApp.stopApp(theApp);
+        }
+        System.out.println("Test PASSED");
+    }
+}