--- a/src/hotspot/share/runtime/arguments.cpp	Wed Apr 18 12:40:11 2018 +0200
+++ b/src/hotspot/share/runtime/arguments.cpp	Wed Apr 18 13:54:07 2018 +0200
@@ -3377,6 +3377,12 @@
     // Disable biased locking now as it interferes with the clean up of
     // the archived Klasses and Java string objects (at dump time only).
     UseBiasedLocking = false;
+
+    // Always verify non-system classes during CDS dump
+    if (!BytecodeVerificationRemote) {
+      BytecodeVerificationRemote = true;
+      log_info(cds)("All non-system classes will be verified (-Xverify:remote) during CDS dump time.");
+    }
   }
   if (UseSharedSpaces && patch_mod_javabase) {
     no_shared_spaces("CDS is disabled when " JAVA_BASE_NAME " module is patched.");