diff --git a/test/compiler/6431242/Test.java b/test/compiler/6431242/Test.java
index d5d8155634d824edd3634cc817214297a59660fd..0c23d1ae2814d5320918858f52bcd718ab2f7a60 100644
--- a/test/compiler/6431242/Test.java
+++ b/test/compiler/6431242/Test.java
@@ -25,7 +25,7 @@
 /*
  * @test
  * @bug 6431242
- * @run main/othervm -server -XX:+PrintCompilation Test
+ * @run main Test
  */
 
 public class Test{
diff --git a/test/compiler/6589834/Test_ia32.java b/test/compiler/6589834/Test_ia32.java
index abc32a12e8d5011516c88792a8031192203fcd6c..56a656e0883e904d4617f03195497af0e3ab229e 100644
--- a/test/compiler/6589834/Test_ia32.java
+++ b/test/compiler/6589834/Test_ia32.java
@@ -26,7 +26,7 @@
  * @bug 6589834
  * @summary deoptimization problem with -XX:+DeoptimizeALot
  *
- * @run main/othervm -server Test_ia32
+ * @run main Test_ia32
  */
 
 /***************************************************************************************
diff --git a/test/compiler/6636138/Test1.java b/test/compiler/6636138/Test1.java
index e154ec1fd9ad73b674471d4a0b90be8e0d339e46..dfc6633930a3a3505c2b6f8498c2c998f313dae8 100644
--- a/test/compiler/6636138/Test1.java
+++ b/test/compiler/6636138/Test1.java
@@ -26,7 +26,7 @@
  * @bug 6636138
  * @summary SuperWord::co_locate_pack(Node_List* p) generates memory graph that leads to memory order violation.
  *
- * @run main/othervm -server -Xbatch -XX:CompileOnly=Test1.init Test1
+ * @run main/othervm -Xbatch -XX:CompileOnly=Test1.init Test1
  */
 
 public class Test1 {
diff --git a/test/compiler/6636138/Test2.java b/test/compiler/6636138/Test2.java
index bcc48a919f932bdeb8eadc95a304d25523047b4b..45cb97b85a9f7d9ab4f95c8024344e0b40fb5b08 100644
--- a/test/compiler/6636138/Test2.java
+++ b/test/compiler/6636138/Test2.java
@@ -26,7 +26,7 @@
  * @bug 6636138
  * @summary SuperWord::co_locate_pack(Node_List* p) generates memory graph that leads to memory order violation.
  *
- * @run main/othervm -server -Xbatch -XX:CompileOnly=Test2.shift Test2
+ * @run main/othervm -Xbatch -XX:CompileOnly=Test2.shift Test2
  */
 
 public class Test2 {
diff --git a/test/compiler/6795161/Test.java b/test/compiler/6795161/Test.java
index f9e8ad88d7da4b4016fefcfbf322df00b4b00b87..b2b69ca4070eca9d38447406ad4aada224ca943b 100644
--- a/test/compiler/6795161/Test.java
+++ b/test/compiler/6795161/Test.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 6795161
  * @summary Escape analysis leads to data corruption
- * @run main/othervm -server  -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:CompileOnly=Test -XX:+DoEscapeAnalysis Test
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:CompileOnly=Test -XX:+DoEscapeAnalysis Test
  */
 
 class Test_Class_1 {
diff --git a/test/compiler/6946040/TestCharShortByteSwap.java b/test/compiler/6946040/TestCharShortByteSwap.java
index f6925e767842c0fe205644aeac9b4dfe746e973c..cddbbd38491882d5a66b67a477bfcf9b831b65d9 100644
--- a/test/compiler/6946040/TestCharShortByteSwap.java
+++ b/test/compiler/6946040/TestCharShortByteSwap.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 6946040
  * @summary Tests Character/Short.reverseBytes and their intrinsics implementation in the server compiler
- * @run main/othervm -Xbatch -server -XX:CompileOnly=.testChar,.testShort TestCharShortByteSwap
+ * @run main/othervm -Xbatch -XX:CompileOnly=.testChar,.testShort TestCharShortByteSwap
  */
 
 // This test must run without any command line arguments.
diff --git a/test/compiler/7068051/Test7068051.sh b/test/compiler/7068051/Test7068051.sh
index ddf3bb9a74c71d01c066182f40d274fa75ac1dfe..3fc263b4e04e01a97bd3be78800de794ee7d867c 100644
--- a/test/compiler/7068051/Test7068051.sh
+++ b/test/compiler/7068051/Test7068051.sh
@@ -45,5 +45,5 @@ ${TESTJAVA}/bin/jar -uf0 foo.jar Test7068051.java
 
 ${TESTJAVA}/bin/javac -d . Test7068051.java
 
-${TESTJAVA}/bin/java -showversion -Xbatch ${TESTVMOPTS} Test7068051 foo.jar
+${TESTJAVA}/bin/java ${TESTVMOPTS} -showversion -Xbatch Test7068051 foo.jar
 
diff --git a/test/compiler/8000805/Test8000805.java b/test/compiler/8000805/Test8000805.java
index bd0b7b41cc6ebad073803487d1bd107210a90c7c..bb8bcd9a0a9dbb3cf0f7bca752be54c1dea11934 100644
--- a/test/compiler/8000805/Test8000805.java
+++ b/test/compiler/8000805/Test8000805.java
@@ -26,7 +26,7 @@
  * @bug 8000805
  * @summary JMM issue: short loads are non-atomic
  *
- * @run main/othervm -server -XX:-TieredCompilation -Xcomp -XX:+PrintCompilation -XX:CompileOnly=Test8000805.loadS2LmaskFF,Test8000805.loadS2Lmask16,Test8000805.loadS2Lmask13,Test8000805.loadUS_signExt,Test8000805.loadB2L_mask8 Test8000805
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xcomp -XX:+PrintCompilation -XX:CompileOnly=Test8000805.loadS2LmaskFF,Test8000805.loadS2Lmask16,Test8000805.loadS2Lmask13,Test8000805.loadUS_signExt,Test8000805.loadB2L_mask8 Test8000805
  */
 
 public class Test8000805 {