diff --git a/go b/go
index a8cb05d85ec5e..93b8a08488137 100755
--- a/go
+++ b/go
@@ -6,9 +6,12 @@ unset GEM_PATH
 
 JAVA_OPTS="-client -Xmx4096m -XX:ReservedCodeCacheSize=512m"
 
-java_version=`java -version 2>&1 | sed 's/java version "1\.\(.*\)\..*"/\1/; 1q'`
+java_version=`java -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1.\2/; 1q'`
 
-JAVA_OPTS="$JAVA_OPTS -XX:MetaspaceSize=1024m  --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED"
+if [[ $java_version != "1.8" ]]
+then
+  JAVA_OPTS="$JAVA_OPTS -XX:MetaspaceSize=1024m --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED"
+fi
 
 java $JAVA_OPTS -jar third_party/jruby/jruby-complete.jar -X-C -S rake $*
 
diff --git a/go.bat b/go.bat
index 700fd465f9a10..af86ff555628f 100755
--- a/go.bat
+++ b/go.bat
@@ -1,2 +1,12 @@
 @echo off
-java -Xmx4096m -XX:MetaspaceSize=1024m -XX:ReservedCodeCacheSize=512m  --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED -client -jar third_party\jruby\jruby-complete.jar -X-C -S rake %*
+SETLOCAL
+
+SET JAVA_OPTS=-client -Xmx4096m -XX:ReservedCodeCacheSize=512m
+
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j.%%k"
+IF "%jver%" == "1.8" GOTO :start
+
+SET JAVA_OPTS=%JAVA_OPTS% --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED
+
+:start
+java %JAVA_OPTS% -jar third_party\jruby\jruby-complete.jar -X-C -S rake %*