--- /dev/null	Tue Jun 18 22:25:52 2013
+++ new/test/sun/reflect/GetCallerClass.java	Tue Jun 18 22:25:52 2013
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/*
+ * @test
+ * @bug 8014925 8016814
+ * @summary sun.reflect.Reflection.getCallerClass(int) is disabled by default 
+ * @compile -XDignore.symbol.file GetCallerClass.java
+ * @run main/othervm GetCallerClass 
+ * @run main/othervm -Djdk.reflect.allowGetCallerClass GetCallerClass 
+ * @run main/othervm -Djdk.reflect.allowGetCallerClass=true GetCallerClass 
+ * @run main/othervm -Djdk.reflect.allowGetCallerClass=false GetCallerClass 
+ */
+
+public class GetCallerClass {
+    public static void main(String[] args) throws Exception {
+        String s = System.getProperty("jdk.reflect.allowGetCallerClass");
+        boolean allowed = s != null ? (s.isEmpty() || Boolean.parseBoolean(s))
+                                    : false;
+        try {
+            Class<?> c = Temp.test();
+            if (!allowed) {
+                throw new RuntimeException("Reflection.getCallerClass should not be allowed");
+            }
+            if (c != GetCallerClass.class) {
+                throw new RuntimeException("Incorrect caller: " + c);
+            }
+        } catch (UnsupportedOperationException e) {
+            if (allowed) throw e;
+        }     
+    }
+
+    @sun.reflect.CallerSensitive
+    public Class<?> getCallerClass() {
+        // 0: Reflection 1: getCallerClass 2: Temp.test 3: main
+        return sun.reflect.Reflection.getCallerClass(3);
+    }
+
+    static class Temp {
+        public static Class<?> test() {
+            return new GetCallerClass().getCallerClass();
+        }
+    }
+}