diff --git a/tests/sim/undriven_replay.ys b/tests/sim/undriven_replay.ys
index 9766a8d60..854a40049 100644
--- a/tests/sim/undriven_replay.ys
+++ b/tests/sim/undriven_replay.ys
@@ -3,8 +3,3 @@ prep -top undriven_replay
 
 logger -expect error "Found 1 undriven signal in the replay trace" 1
 sim -r undriven_replay.vcd -scope undriven_replay -q
-
-logger -expect warning "Input trace contains undriven signal" 1
-sim -r undriven_replay.vcd -scope undriven_replay -q -undriven-warn
-
-sim -r undriven_replay.vcd -scope undriven_replay -q -no-undriven-check
diff --git a/tests/sim/undriven_replay_nocheck.ys b/tests/sim/undriven_replay_nocheck.ys
new file mode 100644
index 000000000..dcb1cfc92
--- /dev/null
+++ b/tests/sim/undriven_replay_nocheck.ys
@@ -0,0 +1,4 @@
+read_verilog undriven_replay.v
+prep -top undriven_replay
+
+sim -r undriven_replay.vcd -scope undriven_replay -q -no-undriven-check
diff --git a/tests/sim/undriven_replay_warn.ys b/tests/sim/undriven_replay_warn.ys
new file mode 100644
index 000000000..ca3b1937c
--- /dev/null
+++ b/tests/sim/undriven_replay_warn.ys
@@ -0,0 +1,5 @@
+read_verilog undriven_replay.v
+prep -top undriven_replay
+
+logger -expect warning "Input trace contains undriven signal" 1
+sim -r undriven_replay.vcd -scope undriven_replay -q -undriven-warn