diff --git a/tests/arch/ice40/ice40_opt.ys b/tests/arch/ice40/ice40_opt.ys
index e779ab207..5a7a39d30 100644
--- a/tests/arch/ice40/ice40_opt.ys
+++ b/tests/arch/ice40/ice40_opt.ys
@@ -24,7 +24,7 @@ EOT
 read_verilog -icells -lib +/ice40/abc9_model.v +/ice40/cells_sim.v
 equiv_opt -assert -map +/ice40/abc9_model.v -map +/ice40/cells_sim.v ice40_opt
 design -load postopt
-select -assert-count 1 t:*
+select -assert-count 1 t:* t:$*_port %d t:$public %d
 select -assert-count 1 t:$lut
 
 # https://github.com/YosysHQ/yosys/issues/1543
diff --git a/tests/various/peepopt.ys b/tests/various/peepopt.ys
index c99d48128..ea81de6e0 100644
--- a/tests/various/peepopt.ys
+++ b/tests/various/peepopt.ys
@@ -92,7 +92,7 @@ prep -nokeepdc
 equiv_opt -assert peepopt
 design -load postopt
 clean
-select -assert-count 0 t:*
+select -assert-count 0 t:* t:$*_port %d t:$public %d
 
 ####################