--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java	2017-03-20 17:37:02.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64.test/src/org/graalvm/compiler/core/amd64/test/MatchRuleTest.java	2017-03-20 17:37:02.000000000 -0700
@@ -24,22 +24,23 @@
 
 import static org.junit.Assume.assumeTrue;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.graalvm.compiler.lir.LIR;
 import org.graalvm.compiler.lir.LIRInstruction;
 import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.MemoryConstOp;
 import org.graalvm.compiler.lir.gen.LIRGenerationResult;
 import org.graalvm.compiler.lir.jtt.LIRTest;
 import org.graalvm.compiler.lir.phases.LIRPhase;
+import org.graalvm.compiler.lir.phases.LIRSuites;
 import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
+import org.graalvm.compiler.options.OptionValues;
+import org.junit.Before;
+import org.junit.Test;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.TargetDescription;
 
 public class MatchRuleTest extends LIRTest {
-    private static LIR lir;
+    private LIR lir;
 
     @Before
     public void checkAMD64() {
@@ -54,13 +55,19 @@
         }
     }
 
+    @Override
+    protected LIRSuites createLIRSuites(OptionValues options) {
+        LIRSuites suites = super.createLIRSuites(options);
+        suites.getPreAllocationOptimizationStage().appendPhase(new CheckPhase());
+        return suites;
+    }
+
     /**
      * Verifies, if the match rules in AMD64NodeMatchRules do work on the graphs by compiling and
      * checking if the expected LIR instruction show up.
      */
     @Test
     public void test1() {
-        getLIRSuites().getPreAllocationOptimizationStage().appendPhase(new CheckPhase());
         compile(getResolvedJavaMethod("test1Snippet"), null);
         boolean found = false;
         for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
@@ -83,7 +90,7 @@
         }
     }
 
-    public static class CheckPhase extends LIRPhase<PreAllocationOptimizationContext> {
+    public class CheckPhase extends LIRPhase<PreAllocationOptimizationContext> {
         @Override
         protected void run(TargetDescription target, LIRGenerationResult lirGenRes, PreAllocationOptimizationContext context) {
             lir = lirGenRes.getLIR();