diff --git a/nashorn/make/build-benchmark.xml b/nashorn/make/build-benchmark.xml
index 927d7cdcb0f..b3ff4bb08c9 100644
--- a/nashorn/make/build-benchmark.xml
+++ b/nashorn/make/build-benchmark.xml
@@ -27,7 +27,7 @@
     <fileset id="octane-set"
 	     dir="${octane-test-sys-prop.test.js.roots}"
 	     excludes="${octane-test-sys-prop.test.js.exclude.list}">
-      <include name="**/*.js"/>
+      <include name="*.js"/>
     </fileset>
     <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
     <property name="extra-arg" value=""/>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 202e0768390..e1e77614e54 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -160,7 +160,9 @@ octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/
 octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
 
 # list of tests to be excluded
-octane-test-sys-prop.test.js.exclude.list=base.js
+octane-test-sys-prop.test.js.exclude.list=\
+    base.js \
+    run.js
 
 # test root for sunspider
 sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/