diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index dda361c1f83..92d6f5dd16f 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -519,6 +519,8 @@ grant codeBase "file:/${basedir}/test/script/markdown.js" {
     <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
       <jvmarg line="${ext.class.path}"/>
       <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs} -Dbuild.dir=${build.dir}"/>
+      <!-- avoid too many typeinfo cache files. Each script is run only once anyway -->
+      <jvmarg line="-Dnashorn.typeInfo.disabled=true"/>
       <classpath>
           <pathelement path="${run.test.classpath}"/>
       </classpath>
diff --git a/nashorn/test/script/basic/compile-octane-normal.js b/nashorn/test/script/basic/compile-octane-normal.js
index c4dd91ed0e3..7fc0c333653 100644
--- a/nashorn/test/script/basic/compile-octane-normal.js
+++ b/nashorn/test/script/basic/compile-octane-normal.js
@@ -29,6 +29,7 @@
  * forever, so make this test future safe, we specify them explicitly
  *
  * @test
+ * @fork
  * @runif external.octane
  * @option -scripting
  * @option -Dnashorn.typeInfo.disabled=true
diff --git a/nashorn/test/script/basic/compile-octane-splitter.js b/nashorn/test/script/basic/compile-octane-splitter.js
index 2bba0e3f4f0..01ef7e525a3 100644
--- a/nashorn/test/script/basic/compile-octane-splitter.js
+++ b/nashorn/test/script/basic/compile-octane-splitter.js
@@ -29,6 +29,7 @@
  * forever, so make this test future safe, we specify them explicitly
  *
  * @test
+ * @fork
  * @option -Dnashorn.compiler.splitter.threshold=1000
  * @fork
  * @runif external.octane