--- a/make/nashorn/package-list	Tue Feb 20 16:10:21 2018 +0100
+++ b/make/nashorn/package-list	Tue Feb 20 12:54:26 2018 -0800
@@ -261,7 +261,6 @@
 jdk.jshell.execution
 jdk.jshell.spi
 jdk.jshell.tool
-jdk.management.cmm
 jdk.management.jfr
 jdk.management.resource
 jdk.nashorn.api.scripting

--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java	Tue Feb 20 16:10:21 2018 +0100
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java	Tue Feb 20 12:54:26 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. 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
@@ -553,7 +553,6 @@
                     classFileCounter++;
 
                     if (className.startsWith("jdk.management.") ||
-                                    className.startsWith("jdk.internal.cmm.*") ||
                                     // GR-5881: The class initializer for
                                     // sun.tools.jconsole.OutputViewer
                                     // spawns non-daemon threads for redirecting sysout and syserr.

--- a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list	Tue Feb 20 16:10:21 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list	Tue Feb 20 12:54:26 2018 -0800
@@ -310,8 +310,6 @@
 module:jdk.management
 com.sun.management
 module:jdk.management.agent
-module:jdk.management.cmm
-jdk.management.cmm
 module:jdk.management.jfr
 jdk.management.jfr
 module:jdk.management.resource