diff --git a/js/rhino/testsrc/org/mozilla/javascript/tests/StrictModeApiTest.java b/js/rhino/testsrc/org/mozilla/javascript/tests/StrictModeApiTest.java
new file mode 100755
index 00000000000..8e7bf1f7447
--- /dev/null
+++ b/js/rhino/testsrc/org/mozilla/javascript/tests/StrictModeApiTest.java
@@ -0,0 +1,61 @@
+/**
+ * 
+ */
+package org.mozilla.javascript.tests;
+
+import junit.framework.TestCase;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.ContextAction;
+import org.mozilla.javascript.ContextFactory;
+import org.mozilla.javascript.Script;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.EvaluatorException;
+
+/**
+ * @author Norris Boyd
+ */
+public class StrictModeApiTest extends TestCase {
+
+  private ScriptableObject global;
+  private ContextFactory contextFactory;
+  
+  static class MyContextFactory extends ContextFactory {
+    @Override
+    protected boolean hasFeature(Context cx, int featureIndex) { 
+        switch (featureIndex) { 
+            case Context.FEATURE_STRICT_MODE:
+            case Context.FEATURE_STRICT_VARS:
+            case Context.FEATURE_STRICT_EVAL:
+            case Context.FEATURE_WARNING_AS_ERROR:
+                return true; 
+        } 
+        return super.hasFeature(cx, featureIndex); 
+    }
+  };
+  
+  public void testAccessingFields() {
+    contextFactory = new MyContextFactory();
+    Context cx = contextFactory.enterContext();
+    try {
+        global = cx.initStandardObjects();
+        try {
+            runScript("({}.nonexistent)");
+            fail();
+        } catch (EvaluatorException e) {
+            assertTrue(e.getMessage().startsWith("Reference to undefined property"));
+        }
+    } finally {
+        Context.exit();
+    }
+  }
+
+  private Object runScript(final String scriptSourceText) {
+    return this.contextFactory.call(new ContextAction() {
+      public Object run(Context context) {
+        Script script = context.compileString(scriptSourceText, "", 1, null);
+        return script.exec(context, global);
+      }
+    });
+  }  
+}