diff -r 52e7ddc77845 -r 0f8dc3693499 hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java	Wed Jun 01 09:13:10 2016 +0300
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java	Thu Jun 16 16:41:50 2016 +0000
@@ -49,7 +49,6 @@
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
 import jdk.vm.ci.hotspot.HotSpotReferenceMap;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
@@ -112,21 +111,4 @@
 
         test(new HotSpotReferenceMap(oops, base, size, 8));
     }
-
-    @Test(expected = JVMCIError.class)
-    public void testInvalidNarrowDerivedOop() {
-        if (!HotSpotVMConfig.config().useCompressedOops) {
-            throw new JVMCIError("skipping test");
-        }
-
-        PlatformKind kind = arch.getPlatformKind(JavaKind.Int);
-        Register reg = getRegister(kind, 0);
-        Register baseReg = getRegister(arch.getPlatformKind(JavaKind.Object), 1);
-
-        Location[] oops = new Location[]{Location.register(reg)};
-        Location[] base = new Location[]{Location.register(baseReg)};
-        int[] size = new int[]{kind.getSizeInBytes()};
-
-        test(new HotSpotReferenceMap(oops, base, size, 8));
-    }
 }