diff -r 45675142a18a -r d374b1634589 test/jdk/java/util/NavigableMap/LockStep.java
--- a/test/jdk/java/util/NavigableMap/LockStep.java	Wed Mar 21 20:15:00 2018 -0700
+++ b/test/jdk/java/util/NavigableMap/LockStep.java	Thu Mar 22 08:39:51 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
  * @bug     6420753 6242436 6691185
  * @summary Compare NavigableMap implementations for identical behavior
  * @run main LockStep
- * @run main/othervm -XX:+AggressiveOpts LockStep
- * @run main/othervm -XX:+AggressiveOpts -Dthorough=true LockStep
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 LockStep
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox -XX:AutoBoxCacheMax=20000 -Dthorough=true LockStep
  * @author  Martin Buchholz
  * @key randomness
  */