diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
index fc6463d2b..1e9de7755 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
@@ -5,8 +5,4 @@
 // ====
 // step: fullSimplify
 // ----
-// {
-//     let _1 := 0
-//     pop(mload(_1))
-//     mstore(_1, 0)
-// }
+// { mstore(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
index eeb5ba1ae..9f916198c 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
@@ -1,6 +1,6 @@
-// div is eliminated, but keccak256 has side-effects.
+// div is eliminated, but create has side-effects.
 {
-	let a := div(keccak256(0, 0), 0)
+	let a := div(create(0, 0, 0), 0)
 	mstore(0, a)
 }
 // ====
@@ -8,6 +8,6 @@
 // ----
 // {
 //     let _1 := 0
-//     pop(keccak256(_1, _1))
+//     pop(create(_1, _1, _1))
 //     mstore(_1, 0)
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/operations.yul b/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
index b0f979276..811f86780 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
@@ -23,7 +23,6 @@
 // step: fullSimplify
 // ----
 // {
-//     pop(mload(0))
 //     mstore(1, 0)
 //     mstore(2, 0)
 //     mstore(3, 0)
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul b/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
index c556fbd8f..df26cae3e 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
@@ -24,8 +24,6 @@
 //     for { } lt(mload(a), mload(b)) { a := mload(b) }
 //     {
 //         let b_3 := mload(a)
-//         pop(mload(b_3))
-//         pop(mload(b_3))
 //         let a_6 := mload(b_3)
 //         b := mload(a_6)
 //     }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
index 2dd2d98b0..0617c47e4 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
@@ -10,10 +10,6 @@
 // step: ssaAndBack
 // ----
 // {
-//     pop(mload(0))
-//     pop(mload(1))
-//     pop(mload(2))
-//     pop(mload(3))
 //     let a_5 := mload(4)
 //     mstore(a_5, 0)
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
index fcdb64437..73aee8516 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
@@ -13,11 +13,6 @@
 // ----
 // {
 //     let a := mload(0)
-//     if mload(1)
-//     {
-//         pop(mload(1))
-//         pop(mload(2))
-//         a := mload(3)
-//     }
+//     if mload(1) { a := mload(3) }
 //     mstore(a, 0)
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
index 024254525..8265f500e 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
@@ -19,15 +19,7 @@
 // {
 //     let a := mload(0)
 //     switch mload(1)
-//     case 0 {
-//         pop(mload(1))
-//         pop(mload(2))
-//         a := mload(3)
-//     }
-//     default {
-//         pop(mload(4))
-//         pop(mload(5))
-//         a := mload(6)
-//     }
+//     case 0 { a := mload(3) }
+//     default { a := mload(6) }
 //     mstore(a, 0)
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul b/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
index dacbc4484..15e56f4d6 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
@@ -7,7 +7,6 @@
 // step: ssaAndBack
 // ----
 // {
-//     pop(mload(0))
 //     let a_2 := mload(1)
 //     mstore(a_2, 0)
 // }