diff --git a/features/support/env.rb b/features/support/env.rb
index d7164f0..791b55c 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -9,6 +9,13 @@
 Aruba.configure do |config|
   config.before_cmd do |cmd|
     set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
-    set_env('JAVA_OPTS', "-d32 #{ENV['JAVA_OPTS']}") # force jRuby to use client JVM for faster startup times
+
+    java_options = ENV['JAVA_OPTS']
+
+    if 1.size == 4 # 4 for 32 bit java, 8 for 64 bit java.
+      set_env('JAVA_OPTS', "-d32 #{java_options}")
+    else
+      set_env('JAVA_OPTS', "-XX:+TieredCompilation -XX:TieredStopAtLevel=1 #{java_options}")
+    end
   end
 end if RUBY_PLATFORM == 'java'