--- old/src/share/vm/services/memoryService.cpp	2017-02-13 23:17:56.738246142 +0100
+++ new/src/share/vm/services/memoryService.cpp	2017-02-13 23:17:56.674246334 +0100
@@ -99,6 +99,10 @@
       add_g1_heap_info(G1CollectedHeap::heap());
       break;
     }
+    case CollectedHeap::EpsilonCollectedHeap : {
+      add_epsilon_heap_info();
+      break;
+    }
 #endif // INCLUDE_ALL_GCS
     default: {
       guarantee(false, "Unrecognized kind of heap");
@@ -188,6 +192,18 @@
   add_g1YoungGen_memory_pool(g1h, _major_gc_manager, _minor_gc_manager);
   add_g1OldGen_memory_pool(g1h, _major_gc_manager);
 }
+
+void MemoryService::add_epsilon_heap_info() {
+  assert(UseEpsilonGC, "sanity");
+
+  _minor_gc_manager = MemoryManager::get_epsilon_memory_manager();
+  _major_gc_manager = MemoryManager::get_epsilon_memory_manager();
+  _managers_list->append(_minor_gc_manager);
+  _managers_list->append(_major_gc_manager);
+// TODO: fix these?
+//  add_g1YoungGen_memory_pool(g1h, _major_gc_manager, _minor_gc_manager);
+//  add_g1OldGen_memory_pool(g1h, _major_gc_manager);
+}
 #endif // INCLUDE_ALL_GCS
 
 MemoryPool* MemoryService::add_gen(Generation* gen,