diff -r c7374ff3f3a3 -r d99af76d7689 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java	Sat Sep 07 10:04:07 2019 -0400
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java	Sat Sep 07 10:05:47 2019 -0700
@@ -28,6 +28,7 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
+import org.graalvm.compiler.nodes.IfNode;
 import org.junit.Test;
 
 import org.graalvm.compiler.api.directives.GraalDirectives;
@@ -133,8 +134,8 @@
     @Test
     public void testThreadSubstitutions() {
         testGraph("currentThread");
-        testGraph("threadIsInterrupted");
-        testGraph("threadInterrupted");
+        assertInGraph(testGraph("threadIsInterrupted", "isInterrupted", true), IfNode.class);
+        assertInGraph(testGraph("threadInterrupted", "isInterrupted", true), IfNode.class);
 
         Thread currentThread = Thread.currentThread();
         test("currentThread", currentThread);