--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Apr 20 20:40:46 2016 +0300
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Thu Apr 21 10:52:00 2016 +0200
@@ -2620,6 +2620,12 @@
     }
     FLAG_SET_CMDLINE(bool, BackgroundCompilation, false);
   }
+  if (UseCompiler && is_interpreter_only()) {
+    if (!FLAG_IS_DEFAULT(UseCompiler)) {
+      warning("UseCompiler disabled due to -Xint.");
+    }
+    FLAG_SET_CMDLINE(bool, UseCompiler, false);
+  }
   return status;
 }