diff --git a/tests/memlib/generate_mk.py b/tests/memlib/generate_mk.py
index 230d2ebd6..9de00df05 100644
--- a/tests/memlib/generate_mk.py
+++ b/tests/memlib/generate_mk.py
@@ -1566,7 +1566,8 @@ for t in TESTS:
                 for kk, vv in ca.items():
                     sf.write("select -assert-count {} t:{} r:{}={} %i\n".format(cc, k, kk, vv))
             else:
-                sf.write("select -assert-count {} t:{}\n".format(v, k))
+                suffix = " t:$*_port %d t:$public %d" if k.startswith("$") else ""
+                sf.write("select -assert-count {} t:{}{}\n".format(v, k, suffix))
 
 def create_tests():
     for t in TESTS:
diff --git a/tests/proc/yosys_latch.ys b/tests/proc/yosys_latch.ys
index c60a5bc00..40e106029 100644
--- a/tests/proc/yosys_latch.ys
+++ b/tests/proc/yosys_latch.ys
@@ -13,7 +13,7 @@ select -assert-count 1 t:$_DLATCH_P_
 select -assert-count 1 t:$_DLATCH_N_
 select -assert-count 1 t:$_DLATCH_PN0_
 select -assert-count 1 t:$_DLATCH_NN0_
-select -assert-count 4 t:*
+select -assert-count 4 t:* t:$*_port %d t:$public %d
 design -load gold
 equiv_opt -assert -multiclock simplemap
 
diff --git a/tests/various/peepopt.ys b/tests/various/peepopt.ys
index e0b9946cf..c99d48128 100644
--- a/tests/various/peepopt.ys
+++ b/tests/various/peepopt.ys
@@ -9,7 +9,7 @@ equiv_opt -assert peepopt
 design -load postopt
 clean
 select -assert-count 1 t:$bmux
-select -assert-count 0 t:$bmux t:* %D
+select -assert-count 0 t:$bmux t:* %D t:$*_port %d t:$public %d
 
 ####################
 
@@ -26,7 +26,7 @@ design -load postopt
 clean
 select -assert-count 1 t:$shr
 select -assert-count 1 t:$mul
-select -assert-count 0 t:$shr t:$mul %% t:* %D
+select -assert-count 0 t:$shr t:$mul %% t:* %D t:$*_port %d t:$public %d
 
 ####################
 
@@ -50,7 +50,7 @@ sat -verify -show-public -enable_undef -prove-asserts miter
 cd gate
 select -assert-count 1 t:$shr
 select -assert-count 1 t:$mul
-select -assert-count 0 t:$shr t:$mul %% t:* %D
+select -assert-count 0 t:$shr t:$mul %% t:* %D t:$*_port %d t:$public %d
 
 ####################
 
@@ -109,7 +109,7 @@ equiv_opt -assert peepopt
 design -load postopt
 clean
 select -assert-count 1 t:$bmux
-select -assert-count 0 t:$bmux t:* %D
+select -assert-count 0 t:$bmux t:* %D t:$*_port %d t:$public %d
 
 ####################
 
@@ -244,4 +244,4 @@ equiv_opt -assert peepopt
 design -load postopt
 clean
 select -assert-count 1 t:$bmux
-select -assert-count 0 t:$bmux t:* %D
+select -assert-count 0 t:$bmux t:* %D t:$*_port %d t:$public %d