--- a/make/test/JtregGraalUnit.gmk	Thu Oct 17 20:27:44 2019 +0100
+++ b/make/test/JtregGraalUnit.gmk	Thu Oct 17 20:53:35 2019 +0100
@@ -65,6 +65,7 @@
           -processorpath $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
           --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED \
           --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
+          --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
 
       ### Copy 3rd party libs
       $(eval $(call SetupCopyFiles, COPY_GRAALUNIT_LIBS, \
@@ -114,6 +115,7 @@
           BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
           CLASSPATH := $(TEST_COMPILE_CP), \
           ADD_JAVAC_FLAGS := $(TEST_JAVAC_FLAGS), \
+          COPY := .input, \
       ))
 
       TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
@@ -141,6 +143,7 @@
       $(eval $(call SetupJarArchive, BUILD_VM_COMPILER_TESTS_JAR, \
           DEPENDENCIES := $(BUILD_VM_COMPILER_TESTS) $(BUILD_VM_COMPILER_TESTS_SET2), \
           SRCS := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+          SUFFIXES:=.class .input, \
           JAR := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests.jar, \
       ))