--- a/src/hotspot/share/runtime/arguments.cpp	Thu Apr 26 18:11:12 2018 +0200
+++ b/src/hotspot/share/runtime/arguments.cpp	Thu Apr 26 18:16:16 2018 +0200
@@ -568,7 +568,6 @@
 static AliasedFlag const aliased_jvm_flags[] = {
   { "DefaultMaxRAMFraction",    "MaxRAMFraction"    },
   { "CreateMinidumpOnCrash",    "CreateCoredumpOnCrash" },
-  { "UseNoGC",                  "UseEpsilonGC" },
   { NULL, NULL}
 };
 

--- a/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabledNoGC.java	Thu Apr 26 18:11:12 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2018, Red Hat, Inc. 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test TestAlwaysPretouch
- * @library /test/lib
- * @summary Basic sanity test for Epsilon
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+UseNoGC TestEpsilonEnabled
- */
-
-import jdk.test.lib.Platform;
-
-public class TestEpsilonEnabled extends AbstractEpsilonTest {
-  public static void main(String[] args) throws Exception {
-    if (Platform.isDebugBuild() && !isEpsilonEnabled()) {
-      throw new IllegalStateException("Debug builds should have Epsilon enabled");
-    }
-    if (!Platform.isDebugBuild() && isEpsilonEnabled()) {
-      throw new IllegalStateException("Non-debug builds should have Epsilon disabled");
-    }
-  }
-}