diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 4a8ae813025..cb1fa4dd053 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -491,6 +491,7 @@ jdk.internal.vm.compiler_EXCLUDES += \
     org.graalvm.compiler.jtt \
     org.graalvm.compiler.lir.jtt \
     org.graalvm.compiler.lir.test \
+    org.graalvm.compiler.loop.test \
     org.graalvm.compiler.microbenchmarks \
     org.graalvm.compiler.nodes.test \
     org.graalvm.compiler.options.test \
@@ -498,6 +499,7 @@ jdk.internal.vm.compiler_EXCLUDES += \
     org.graalvm.compiler.replacements.test \
     org.graalvm.compiler.test \
     org.graalvm.compiler.virtual.bench \
+    org.graalvm.util.test \
     #
 
 ################################################################################
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index 192f468783f..428c58392d0 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -124,6 +124,7 @@ CORE_EXCLUDED_PACKAGES += \
     org.w3c.dom.stylesheets \
     org.w3c.dom.xpath \
     org.graalvm.compiler.% \
+    org.graalvm.util% \
     #
 
 CORE_PACKAGES := $(filter-out $(CORE_EXCLUDED_PACKAGES), \