diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index cbf7f29bf22..623719169d3 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -278,7 +278,6 @@
       </classpath>
       <fileset dir="${dynalink.module.src.dir}" includes="**/*.java"/>
       <fileset dir="${nashorn.module.src.dir}" includes="**/*.java"/>
-      <fileset dir="${nashorn.shell.module.src.dir}" includes="**/*.java"/>
       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
   </target>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 9b61ea87688..da1c640a5d6 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -356,6 +356,7 @@ run.test.jvmargs.common=\
   -server \
   ${test.module.imports} \
   ${run.test.jvmargs.external} \
+  --add-modules jdk.scripting.nashorn.shell \
   ${nashorn.override.option} \
   -Dfile.encoding=UTF-8 \
   -Duser.language=${run.test.user.language} \