diff --git a/tests/test_xdsl_op_correctness.py b/tests/test_xdsl_op_correctness.py
index f0cb28d794..eb2a10c890 100644
--- a/tests/test_xdsl_op_correctness.py
+++ b/tests/test_xdsl_op_correctness.py
@@ -91,20 +91,22 @@ def test_u_and_v_conversion():
 
     scffor_ops = list(ops[6].regions[0].blocks[0].ops)
 
-    assert len(scffor_ops) == 7
+    assert len(scffor_ops) == 9
 
     # First
     assert isinstance(scffor_ops[0], LoadOp)
     assert isinstance(scffor_ops[1], LoadOp)
     assert isinstance(scffor_ops[2], ApplyOp)
     assert isinstance(scffor_ops[3], StoreOp)
+    assert isinstance(scffor_ops[4], LoadOp)
 
     # Second
-    assert isinstance(scffor_ops[4], ApplyOp)
-    assert isinstance(scffor_ops[5], StoreOp)
+    assert isinstance(scffor_ops[5], ApplyOp)
+    assert isinstance(scffor_ops[6], StoreOp)
+    assert isinstance(scffor_ops[7], LoadOp)
 
     # Yield
-    assert isinstance(scffor_ops[6], Yield)
+    assert isinstance(scffor_ops[8], Yield)
 
     assert type(ops[7] == Call)
     assert type(ops[8] == StoreOp)
diff --git a/tests/test_xdsl_operator.py b/tests/test_xdsl_operator.py
index 9fa0fee21a..f06df254de 100644
--- a/tests/test_xdsl_operator.py
+++ b/tests/test_xdsl_operator.py
@@ -32,15 +32,16 @@ def test_create_xdsl_operator():
     assert type(ops[6] == For)
 
     scffor_ops = list(ops[6].regions[0].blocks[0].ops)
-    assert len(scffor_ops) == 4
+    assert len(scffor_ops) == 5
 
     # First
     assert isinstance(scffor_ops[0], LoadOp)
     assert isinstance(scffor_ops[1], ApplyOp)
     assert isinstance(scffor_ops[2], StoreOp)
+    assert isinstance(scffor_ops[3], LoadOp)
 
     # Yield
-    assert isinstance(scffor_ops[3], Yield)
+    assert isinstance(scffor_ops[4], Yield)
 
     assert type(ops[7] == Call)
     assert type(ops[8] == StoreOp)
diff --git a/tests/test_xdsl_passes.py b/tests/test_xdsl_passes.py
index 9fce974b8d..ff937d92b2 100644
--- a/tests/test_xdsl_passes.py
+++ b/tests/test_xdsl_passes.py
@@ -90,10 +90,13 @@ def test_xdsl_III():
 
     scffor_ops = list(ops[6].regions[0].blocks[0].ops)
 
+    assert len(scffor_ops) == 5
+
     assert isinstance(scffor_ops[0], LoadOp)
     assert isinstance(scffor_ops[1], ApplyOp)
     assert isinstance(scffor_ops[2], StoreOp)
-    assert isinstance(scffor_ops[3], Yield)
+    assert isinstance(scffor_ops[3], LoadOp)
+    assert isinstance(scffor_ops[4], Yield)
 
     assert type(ops[7] == Call)
     assert type(ops[8] == StoreOp)