--- old/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh	2018-03-06 15:23:58.000000000 -0800
+++ new/test/jdk/java/lang/invoke/VarHandles/generate-vh-tests.sh	2018-03-06 15:23:57.000000000 -0800
@@ -28,6 +28,12 @@
       ;;
   esac
 
+  case $type in
+    boolean|byte|short|char|int|long|float|double)
+      args="$args -KValue"
+      ;;
+  esac
+
   wrong_primitive_type=boolean
 
   case $type in