--- old/src/share/vm/memory/universe.cpp	2017-03-12 11:11:16.586859695 +0100
+++ new/src/share/vm/memory/universe.cpp	2017-03-12 11:11:16.526859956 +0100
@@ -82,6 +82,8 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectorPolicy.hpp"
 #include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/epsilon/epsilonCollectedHeap.hpp"
+#include "gc/epsilon/epsilonCollectorPolicy.hpp"
 #include "gc/shared/adaptiveSizePolicy.hpp"
 #endif // INCLUDE_ALL_GCS
 #if INCLUDE_CDS
@@ -735,6 +737,8 @@
 #endif
   } else if (UseSerialGC) {
     return Universe::create_heap_with_policy<GenCollectedHeap, MarkSweepPolicy>();
+  } else if (UseEpsilonGC) {
+    return Universe::create_heap_with_policy<EpsilonCollectedHeap, EpsilonCollectorPolicy>();
   }
 
   ShouldNotReachHere();