diff --git a/tests/various/check_2.ys b/tests/various/check_2.ys
index b63ea6837..0f73b3469 100644
--- a/tests/various/check_2.ys
+++ b/tests/various/check_2.ys
@@ -11,7 +11,5 @@ module top(input clk, input a, input b, output [9:0] x);
 endmodule
 EOF
 hierarchy -top top
+logger -expect error "found logic loop in module top:" 1
 prep
-logger -expect warning "found logic loop in module top:" 1
-logger -expect error "Found 1 problems in 'check -assert'" 1
-check -assert
diff --git a/tests/various/check_3.ys b/tests/various/check_3.ys
index 14915ab8d..102880cd0 100644
--- a/tests/various/check_3.ys
+++ b/tests/various/check_3.ys
@@ -14,7 +14,6 @@ module pingpong(input wire [1:0] x, output wire [3:0] y1, output wire [3:0] y2);
 endmodule
 EOF
 hierarchy -top pingpong
+logger -expect error "found logic loop in module pingpong:" 1
+logger -expect error "Found [0-9]+ severe problems in 'check'" 1
 prep
-logger -nowarn "found logic loop in module pingpong:"
-logger -expect error "Found [0-9]+ problems in 'check -assert'" 1
-check -assert
diff --git a/tests/various/check_4.ys b/tests/various/check_4.ys
index 010cd01fd..1f72928c2 100644
--- a/tests/various/check_4.ys
+++ b/tests/various/check_4.ys
@@ -25,5 +25,5 @@ opt -keepdc
 memory_dff
 opt_clean
 logger -nowarn "found logic loop in module pingpong:"
-logger -expect error "Found [0-9]+ problems in 'check -assert'" 1
+logger -expect error "Found [0-9]+ severe problems in 'check'" 1
 check -assert
diff --git a/tests/various/constant_drive_conflict.ys b/tests/various/constant_drive_conflict.ys
index 1246cbcae..e528e1ab0 100644
--- a/tests/various/constant_drive_conflict.ys
+++ b/tests/various/constant_drive_conflict.ys
@@ -8,7 +8,7 @@ EOT
 
 hierarchy -top top; proc
 
-logger -expect warning "Drivers conflicting with a constant" 1
+logger -expect error "Drivers conflicting with a constant" 1
 logger -expect log "Found and reported 1 problems." 1
 check
 logger -check-expected
@@ -26,7 +26,7 @@ EOT
 
 hierarchy -top top; proc
 
-logger -expect warning "Drivers conflicting with a constant" 1
+logger -expect error "Drivers conflicting with a constant" 1
 logger -expect log "Found and reported 1 problems." 1
 check
 logger -check-expected
@@ -45,7 +45,7 @@ EOT
 
 hierarchy -top top
 
-logger -expect warning "Drivers conflicting with a constant" 1
+logger -expect error "Drivers conflicting with a constant" 1
 logger -expect log "Found and reported 1 problems." 1
 check
 logger -check-expected