diff --git a/tests/filecheck/.lit_test_times.txt b/tests/filecheck/.lit_test_times.txt
index 84be361be3..b1051222fe 100644
--- a/tests/filecheck/.lit_test_times.txt
+++ b/tests/filecheck/.lit_test_times.txt
@@ -1,9 +1,9 @@
-1.627717e-01 shape_inference.mlir
-9.103966e-02 version.mlir
--1.920681e-01 xdsl_mpi_pipeline.mlir
--1.922677e-01 xdsl_mpi_pipeline_b.mlir
--1.886339e-01 xdsl_mpi_pipeline_c.mlir
--2.020643e-01 xdsl_mpi_pipeline_d.mlir
--2.121959e-01 xdsl_mpi_pipeline_e.mlir
--2.791779e-01 xdsl_pipeline.mlir
--1.644087e-01 xdsl_pipeline_openmp.mlir
+1.647806e-01 shape_inference.mlir
+8.123279e-02 version.mlir
+-2.095106e-01 xdsl_mpi_pipeline.mlir
+-2.172942e-01 xdsl_mpi_pipeline_b.mlir
+-7.517524e-01 xdsl_mpi_pipeline_c.mlir
+-7.795422e-01 xdsl_mpi_pipeline_d.mlir
+-8.045800e-01 xdsl_mpi_pipeline_e.mlir
+-2.641258e-01 xdsl_pipeline.mlir
+-1.632233e-01 xdsl_pipeline_openmp.mlir
diff --git a/tests/filecheck/xdsl_mpi_pipeline.mlir b/tests/filecheck/xdsl_mpi_pipeline.mlir
index d4c986a0b1..6c817792d8 100644
--- a/tests/filecheck/xdsl_mpi_pipeline.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p "distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false}" %s | filecheck %s
+// RUN: xdsl-opt -p "distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},shape-inference" %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%u_vec0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec1 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec2 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %timers : !llvm.ptr) {
diff --git a/tests/filecheck/xdsl_mpi_pipeline_b.mlir b/tests/filecheck/xdsl_mpi_pipeline_b.mlir
index b27625d132..684e714266 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_b.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_b.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p "distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},canonicalize-dmp" %s | filecheck %s
+// RUN: xdsl-opt -p "canonicalize,cse,distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},shape-inference,canonicalize-dmp" %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%u_vec0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec1 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec2 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %timers : !llvm.ptr) {
diff --git a/tests/filecheck/xdsl_mpi_pipeline_c.mlir b/tests/filecheck/xdsl_mpi_pipeline_c.mlir
index 93ba65c468..e94a7d2504 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_c.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_c.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p "distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},canonicalize-dmp,convert-stencil-to-ll-mlir" %s | filecheck %s
+// RUN: xdsl-opt -p "canonicalize,cse,distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},shape-inference,canonicalize-dmp,stencil-bufferize,dmp-to-mpi{mpi_init=false},convert-stencil-to-ll-mlir" %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%u_vec0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec1 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec2 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %timers : !llvm.ptr) {
diff --git a/tests/filecheck/xdsl_mpi_pipeline_d.mlir b/tests/filecheck/xdsl_mpi_pipeline_d.mlir
index b02f1d4baf..24460a858d 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_d.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_d.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p "distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},canonicalize-dmp,convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,64,0}" %s | filecheck %s
+// RUN: xdsl-opt -p "canonicalize,cse,distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},shape-inference,canonicalize-dmp,stencil-bufferize,dmp-to-mpi{mpi_init=false},convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,64,0}" %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%u_vec0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec1 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec2 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %timers : !llvm.ptr) {
diff --git a/tests/filecheck/xdsl_mpi_pipeline_e.mlir b/tests/filecheck/xdsl_mpi_pipeline_e.mlir
index 3c230e1125..14e82658d0 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_e.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_e.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p "distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},canonicalize-dmp,convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,64,0},dmp-to-mpi{mpi_init=false},lower-mpi" %s | filecheck %s
+// RUN: xdsl-opt -p "canonicalize,cse,distribute-stencil{strategy=3d-grid slices=2,1,1 restrict_domain=false},shape-inference,canonicalize-dmp,stencil-bufferize,dmp-to-mpi{mpi_init=false},convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,64,0},dmp-to-mpi{mpi_init=false},lower-mpi" %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%u_vec0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec1 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %u_vec2 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, %timers : !llvm.ptr) {
diff --git a/tests/filecheck/xdsl_pipeline.mlir b/tests/filecheck/xdsl_pipeline.mlir
index 726f57e097..f2981a3a17 100644
--- a/tests/filecheck/xdsl_pipeline.mlir
+++ b/tests/filecheck/xdsl_pipeline.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p shape-inference,convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,0},printf-to-llvm,canonicalize %s | filecheck %s
+// RUN: xdsl-opt -p canonicalize,cse,shape-inference,stencil-bufferize,convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,0},printf-to-llvm,canonicalize %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%f2_vec0 : !stencil.field<[-2,5]x[-2,5]xf32>, %f2_vec1 : !stencil.field<[-2,5]x[-2,5]xf32>, %timers : !llvm.ptr) {
diff --git a/tests/filecheck/xdsl_pipeline_openmp.mlir b/tests/filecheck/xdsl_pipeline_openmp.mlir
index 85005e4770..127763e598 100644
--- a/tests/filecheck/xdsl_pipeline_openmp.mlir
+++ b/tests/filecheck/xdsl_pipeline_openmp.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p "canonicalize" %s | filecheck %s
+// RUN: xdsl-opt -p "canonicalize,cse" %s | filecheck %s
 
 builtin.module {
   func.func @xDSLDiffusionOperator(%u_vec0 : memref<158x158x158xf32>, %u_vec1 : memref<158x158x158xf32>, %timers : !llvm.ptr) {