diff --git a/tests/opt/opt_expr_more.ys b/tests/opt/opt_expr_more.ys
index 795ae89c4..20b4e0130 100644
--- a/tests/opt/opt_expr_more.ys
+++ b/tests/opt/opt_expr_more.ys
@@ -50,7 +50,7 @@ opt_expr -fine
 # The division by zero should be removed
 select -assert-count 0 t:$div
 # No cells should be left as it's replaced with constant undef
-select -assert-none t:*
+select -assert-none t:* t:$input_port %d
 
 design -reset
 read_verilog <<EOT
@@ -64,7 +64,7 @@ design -load postopt
 # The mux should be removed completely
 select -assert-count 0 t:$mux
 # No additional cells needed - direct connection
-select -assert-none t:*
+select -assert-none t:* t:$input_port %d
 
 design -reset
 read_verilog <<EOT
@@ -110,7 +110,7 @@ design -load postopt
 # The comparison of different constants should be replaced with constant 0
 select -assert-count 0 t:$eq
 # No other cells should be present (just the constant driver)
-select -assert-none t:*
+select -assert-none t:* t:$input_port %d
 
 # opt.opt_expr.invert.double
 
@@ -131,7 +131,7 @@ design -load postopt
 opt_clean -purge
 select -assert-count 0 t:$not
 # No other cells should be present
-select -assert-none t:*
+select -assert-none t:* t:$input_port %d
 
 # opt.opt_expr.reduce_xnor_not
 
diff --git a/tests/opt/opt_expr_or.ys b/tests/opt/opt_expr_or.ys
index f86da0d46..0235c99dc 100644
--- a/tests/opt/opt_expr_or.ys
+++ b/tests/opt/opt_expr_or.ys
@@ -12,12 +12,12 @@ copy gold fine_keepdc
 
 cd coarse
 opt_expr
-select -assert-none c:*
+select -assert-none c:* t:$input_port %d
 
 cd fine
 simplemap
 opt_expr
-select -assert-none c:*
+select -assert-none c:* t:$input_port %d
 
 cd
 miter -equiv -flatten -make_assert -make_outputs -ignore_gold_x gold coarse miter
@@ -27,12 +27,12 @@ sat -verify -prove-asserts -show-ports -enable_undef miter2
 
 cd coarse_keepdc
 opt_expr -keepdc
-select -assert-count 1 c:*
+select -assert-count 1 c:* t:$input_port %d
 
 cd fine_keepdc
 simplemap
 opt_expr -keepdc
-select -assert-count 1 c:*
+select -assert-count 1 c:* t:$input_port %d
 
 cd
 miter -equiv -flatten -make_assert -make_outputs gold coarse_keepdc miter3
@@ -56,12 +56,12 @@ copy gold fine_keepdc
 
 cd coarse
 opt_expr -fine
-select -assert-none c:*
+select -assert-none c:* t:$input_port %d
 
 cd fine
 simplemap
 opt_expr
-select -assert-none c:*
+select -assert-none c:* t:$input_port %d
 
 cd
 miter -equiv -flatten -make_assert -make_outputs -ignore_gold_x gold coarse miter
@@ -71,12 +71,12 @@ sat -verify -prove-asserts -show-ports -enable_undef miter2
 
 cd coarse_keepdc
 opt_expr -fine -keepdc
-select -assert-count 1 c:*
+select -assert-count 1 c:* t:$input_port %d
 
 cd fine_keepdc
 simplemap
 opt_expr -keepdc
-select -assert-count 2 c:*
+select -assert-count 2 c:* t:$input_port %d
 
 cd
 miter -equiv -flatten -make_assert -make_outputs gold coarse_keepdc miter3
diff --git a/tests/opt/opt_expr_xnor.ys b/tests/opt/opt_expr_xnor.ys
index 225df7076..b06dcb118 100644
--- a/tests/opt/opt_expr_xnor.ys
+++ b/tests/opt/opt_expr_xnor.ys
@@ -27,7 +27,7 @@ sat -verify -prove-asserts -show-ports -enable_undef miter2
 
 cd coarse_keepdc
 opt_expr -keepdc
-select -assert-count 1 c:*
+select -assert-count 1 c:* t:$input_port %d
 
 cd fine_keepdc
 simplemap
diff --git a/tests/opt/opt_expr_xor.ys b/tests/opt/opt_expr_xor.ys
index 9edec35d6..0fb41ba50 100644
--- a/tests/opt/opt_expr_xor.ys
+++ b/tests/opt/opt_expr_xor.ys
@@ -66,12 +66,12 @@ copy gold fine_keepdc
 
 cd coarse
 opt_expr
-select -assert-none c:*
+select -assert-none c:* t:$input_port %d
 
 cd fine
 simplemap
 opt_expr
-select -assert-none c:*
+select -assert-none c:* t:$input_port %d
 
 cd
 miter -equiv -flatten -make_assert -make_outputs -ignore_gold_x gold coarse miter
@@ -81,12 +81,12 @@ sat -verify -prove-asserts -show-ports -enable_undef miter2
 
 cd coarse_keepdc
 opt_expr -keepdc
-select -assert-count 1 c:*
+select -assert-count 1 c:* t:$input_port %d
 
 cd fine_keepdc
 simplemap
 opt_expr -keepdc
-select -assert-count 1 c:*
+select -assert-count 1 c:* t:$input_port %d
 
 cd
 miter -equiv -flatten -make_assert -make_outputs gold coarse_keepdc miter3