--- a/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Tue Apr 07 11:20:51 2015 +0200
+++ b/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Tue Apr 07 14:58:49 2015 +0200
@@ -131,14 +131,15 @@
             throw new RuntimeException(method
                     + " is not compilable after clearMethodState()");
         }
-
+        // Make method not (OSR-)compilable (depending on testCase.isOsr())
         makeNotCompilable();
         if (isCompilable()) {
             throw new RuntimeException(method + " must be not compilable");
         }
-
+        // Try to (OSR-)compile method
         compile();
-        checkNotCompiled();
+        // Method should not be (OSR-)compiled
+        checkNotCompiled(testCase.isOsr());
         if (isCompilable()) {
             throw new RuntimeException(method + " must be not compilable");
         }