--- /dev/null	2017-01-22 10:16:57.869617664 -0800
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java	2017-02-15 16:59:29.533941094 -0800
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2015, 2015, 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.
+ */
+package org.graalvm.compiler.hotspot.test;
+
+import java.util.Objects;
+
+import org.junit.Test;
+
+import org.graalvm.compiler.core.common.GraalOptions;
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.options.OptionValue;
+import org.graalvm.compiler.options.OptionValue.OverrideScope;
+import org.graalvm.compiler.phases.tiers.Suites;
+
+import jdk.vm.ci.meta.JavaKind;
+
+public class LoadJavaMirrorWithKlassTest extends GraalCompilerTest {
+
+    private static class Wrapper {
+        private Class<?> clazz;
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof Wrapper) {
+                return Objects.equals(this.clazz, ((Wrapper) obj).clazz);
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return clazz.hashCode();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("try")
+    protected Suites createSuites() {
+        try (OverrideScope s = OptionValue.override(GraalOptions.ImmutableCode, true)) {
+            return super.createSuites();
+        }
+    }
+
+    @Override
+    protected boolean checkLowTierGraph(StructuredGraph graph) {
+        for (ConstantNode constantNode : graph.getNodes().filter(ConstantNode.class)) {
+            assert constantNode.asJavaConstant() == null || constantNode.asJavaConstant().getJavaKind() != JavaKind.Object ||
+                            constantNode.asJavaConstant().isDefaultForKind() : "Found unexpected object constant " +
+                                            constantNode + ", this should have been removed by the LoadJavaMirrorWithKlassPhase.";
+        }
+        return true;
+    }
+
+    public static Class<?> classConstant() {
+        return Wrapper.class;
+    }
+
+    @Test
+    public void testClassConstant() {
+        test("classConstant");
+    }
+
+    public static Class<?> primitiveClassConstant() {
+        return int.class;
+    }
+
+    @Test
+    public void testPrimitiveClassConstant() {
+        test("primitiveClassConstant");
+    }
+
+    public static Wrapper compressedClassConstant(Wrapper w) {
+        w.clazz = Wrapper.class;
+        return w;
+    }
+
+    @Test
+    public void testCompressedClassConstant() {
+        ArgSupplier arg = () -> new Wrapper();
+        test("compressedClassConstant", arg);
+    }
+
+    public static Wrapper compressedPrimitiveClassConstant(Wrapper w) {
+        w.clazz = int.class;
+        return w;
+    }
+
+    @Test
+    public void testCompressedPrimitiveClassConstant() {
+        ArgSupplier arg = () -> new Wrapper();
+        test("compressedPrimitiveClassConstant", arg);
+    }
+}