--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Jun 23 22:10:33 2015 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jun 24 08:37:12 2015 +0200
@@ -1535,7 +1535,11 @@
     if (should_auto_select_low_pause_collector()) {
       FLAG_SET_ERGO(bool, UseConcMarkSweepGC, true);
     } else {
+#if defined(JAVASE_EMBEDDED)
       FLAG_SET_ERGO(bool, UseParallelGC, true);
+#else
+      FLAG_SET_ERGO(bool, UseG1GC, true);
+#endif
     }
   } else {
     FLAG_SET_ERGO(bool, UseSerialGC, true);