diff --git a/make/build.xml b/make/build.xml
index 4d23f2282c91f10d764656935318aa492a39fd96..35877aef6d1cdb0ef3712acaeb8f59ec3183895b 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -348,6 +348,10 @@ grant codeBase "file:/${basedir}/test/script/basic/classloader.js" {
+
+
+
+
@@ -361,6 +365,21 @@ grant codeBase "file:/${basedir}/test/script/basic/classloader.js" {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/make/project.properties b/make/project.properties
index 8c5dd4f455cc8c406c954ce7460951fe36e14c41..d38dd50d85145594b232900819cd954626b6ca92 100644
--- a/make/project.properties
+++ b/make/project.properties
@@ -59,6 +59,7 @@ nashorn.api.tests.jar=${build.dir}/nashorn-api-tests.jar
# test results directory
build.test.results.dir=${build.dir}/test/reports
+build.nosecurity.test.results.dir=${build.dir}/test/nosecurity/reports
# This directory is removed when the project is cleaned:
dist.dir=dist
@@ -110,6 +111,7 @@ run.classpath=\
# test scripts to run
test.dir=test
+test.nosecurity.dir=test/script/nosecurity
test.script.dir=test/script
test.basic.dir=test/script/basic
test.maptests.dir=test/script/maptests
@@ -127,8 +129,12 @@ test-sys-prop.test262.suite.dir=${test262.suite.dir}
test-sys-prop.es5conform.testcases.dir=${test.external.dir}/ES5Conform/TestCases
test-sys-prop.test.basic.dir=${test.basic.dir}
+test-sys-prop-no-security.test.dir=${test.dir}
+test-sys-prop-no-security.test.js.roots=${test.nosecurity.dir}
+
# framework root for our script tests
test-sys-prop.test.js.framework=${test.script.dir}/assert.js
+test-sys-prop-no-security.test.js.framework=${test.script.dir}/assert.js
# Control the verbosity of ParserTest
test-sys-prop.parsertest.verbose=false
diff --git a/test/script/nosecurity/nosecurity.js b/test/script/nosecurity/nosecurity.js
new file mode 100644
index 0000000000000000000000000000000000000000..688af8cf6a02ef853769f3a29b1bde6d21b2adbe
--- /dev/null
+++ b/test/script/nosecurity/nosecurity.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * 8043443: Test framework changes to run script tests without security manager
+ * @test
+ * @run
+ */
+
+var System = Java.type("java.lang.System");
+
+if (System.securityManager != null) {
+ fail("SecurityManager is set!");
+}