diff -r a628f1855f4c src/hotspot/share/gc/shared/gc_globals.hpp
--- a/src/hotspot/share/gc/shared/gc_globals.hpp	Wed Apr 18 10:07:49 2018 +0200
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp	Wed Apr 18 11:01:31 2018 +0200
@@ -129,7 +129,7 @@
   product(bool, UseParallelOldGC, false,                                    \
           "Use the Parallel Old garbage collector")                         \
                                                                             \
-  develop(bool, UseEpsilonGC, false,                                        \
+  experimental(bool, UseEpsilonGC, false,                                   \
           "Use the Epsilon (no-op) garbage collector")                      \
                                                                             \
   product(uint, ParallelGCThreads, 0,                                       \
diff -r a628f1855f4c test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java
--- a/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java	Wed Apr 18 10:07:49 2018 +0200
+++ b/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java	Wed Apr 18 11:01:31 2018 +0200
@@ -35,8 +35,8 @@
     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");
+    if (!Platform.isDebugBuild() && !isEpsilonEnabled()) {
+      throw new IllegalStateException("Non-debug builds should have Epsilon enabled");
     }
   }
 }