--- old/src/share/vm/memory/universe.cpp	Tue Dec 15 14:46:00 2015
+++ new/src/share/vm/memory/universe.cpp	Tue Dec 15 14:45:58 2015
@@ -1103,6 +1103,17 @@
   }
 }
 
+bool Universe::should_verify_subset(const char* subset) {
+  if (VerifySubSet == NULL || VerifySubSet[0] == '\0') {
+    // VerifySubSet is not specified, verify everything
+    return true;
+  }
+  if (strstr(VerifySubSet, subset)) {
+    return true;
+  }
+  return false;
+}
+
 void Universe::verify(VerifyOption option, const char* prefix) {
   // The use of _verify_in_progress is a temporary work around for
   // 6320749.  Don't bother with a creating a class to set and clear
@@ -1122,33 +1133,55 @@
 
   FormatBuffer<> title("Verifying %s", prefix);
   GCTraceTime(Info, gc, verify) tm(title.buffer());
-  log_debug(gc, verify)("Threads");
-  Threads::verify();
-  log_debug(gc, verify)("Heap");
-  heap()->verify(option);
-  log_debug(gc, verify)("SymbolTable");
-  SymbolTable::verify();
-  log_debug(gc, verify)("StringTable");
-  StringTable::verify();
+  if (should_verify_subset("threads")) {
+    log_debug(gc, verify)("Threads");
+    Threads::verify();
+  }
+  if (should_verify_subset("heap")) {
+    log_debug(gc, verify)("Heap");
+    heap()->verify(option);
+  }
+  if (should_verify_subset("symbol_table")) {
+    log_debug(gc, verify)("SymbolTable");
+    SymbolTable::verify();
+  }
+  if (should_verify_subset("string_table")) {
+    log_debug(gc, verify)("StringTable");
+    StringTable::verify();
+  }
+  if (should_verify_subset("codecache")) {
   {
     MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     log_debug(gc, verify)("CodeCache");
     CodeCache::verify();
   }
-  log_debug(gc, verify)("SystemDictionary");
-  SystemDictionary::verify();
+  }
+  if (should_verify_subset("dictionary")) {
+    log_debug(gc, verify)("SystemDictionary");
+    SystemDictionary::verify();
+  }
 #ifndef PRODUCT
-  log_debug(gc, verify)("ClassLoaderDataGraph");
-  ClassLoaderDataGraph::verify();
+  if (should_verify_subset("classloader_data_graph")) {
+    log_debug(gc, verify)("ClassLoaderDataGraph");
+    ClassLoaderDataGraph::verify();
+  }
 #endif
-  log_debug(gc, verify)("MetaspaceAux");
-  MetaspaceAux::verify_free_chunks();
-  log_debug(gc, verify)("JNIHandles");
-  JNIHandles::verify();
-  log_debug(gc, verify)("C-heap");
-  os::check_heap();
-  log_debug(gc, verify)("CodeCache Oops");
-  CodeCache::verify_oops();
+  if (should_verify_subset("metaspace")) {
+    log_debug(gc, verify)("MetaspaceAux");
+    MetaspaceAux::verify_free_chunks();
+  }
+  if (should_verify_subset("jni_handles")) {
+    log_debug(gc, verify)("JNIHandles");
+    JNIHandles::verify();
+  }
+  if (should_verify_subset("c-heap")) {
+    log_debug(gc, verify)("C-heap");
+    os::check_heap();
+  }
+  if (should_verify_subset("codecache_oops")) {
+    log_debug(gc, verify)("CodeCache Oops");
+    CodeCache::verify_oops();
+  }
 
   _verify_in_progress = false;
 }