--- a/src/hotspot/share/runtime/arguments.cpp	Mon Feb 25 15:41:24 2019 +0100
+++ b/src/hotspot/share/runtime/arguments.cpp	Thu Mar 14 09:38:17 2019 -0400
@@ -3918,6 +3918,13 @@
     warning("Setting CompressedClassSpaceSize has no effect when compressed class pointers are not used");
   }
 
+  // Treat the odd case where local verification is enabled but remote
+  // verification is not as if both were enabled.
+  if (BytecodeVerificationLocal && !BytecodeVerificationRemote) {
+    log_info(verification)("Turning on remote verification because local verification is on");
+    FLAG_SET_DEFAULT(BytecodeVerificationRemote, true);
+  }
+
 #ifndef PRODUCT
   if (!LogVMOutput && FLAG_IS_DEFAULT(LogVMOutput)) {
     if (use_vm_log()) {