--- a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp	Thu Jan 18 11:43:21 2018 +0100
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp	Thu Jan 18 12:08:41 2018 +0100
@@ -38,7 +38,14 @@
 void EpsilonArguments::initialize_flags() {
   GCArguments::initialize_flags();
 
-  assert(UseEpsilonGC, "Error");
+  assert(UseEpsilonGC || UseNoGC, "Error");
+
+  // UseNoGC is the alias, drop and replace it with the a single option:
+  // the rest of the code can use UseEpsilonGC then.
+  if (UseNoGC) {
+    FLAG_SET_DEFAULT(UseEpsilonGC, true);
+    FLAG_SET_DEFAULT(UseNoGC, false);
+  }
 
   // Forcefully exit when OOME is detected. Nothing we can do at that point.
   if (FLAG_IS_DEFAULT(ExitOnOutOfMemoryError)) {