diff --git a/tests/various/opt_expr.ys b/tests/opt/opt_expr.ys
similarity index 100%
rename from tests/various/opt_expr.ys
rename to tests/opt/opt_expr.ys
diff --git a/tests/various/opt_rmdff.v b/tests/opt/opt_rmdff.v
similarity index 100%
rename from tests/various/opt_rmdff.v
rename to tests/opt/opt_rmdff.v
diff --git a/tests/various/opt_rmdff.ys b/tests/opt/opt_rmdff.ys
similarity index 100%
rename from tests/various/opt_rmdff.ys
rename to tests/opt/opt_rmdff.ys
diff --git a/tests/opt/opt_ff_sat.v b/tests/opt/opt_rmdff_sat.v
similarity index 100%
rename from tests/opt/opt_ff_sat.v
rename to tests/opt/opt_rmdff_sat.v
diff --git a/tests/opt/opt_ff_sat.ys b/tests/opt/opt_rmdff_sat.ys
similarity index 70%
rename from tests/opt/opt_ff_sat.ys
rename to tests/opt/opt_rmdff_sat.ys
index 4e7cc6ca4..1c3dd9c05 100644
--- a/tests/opt/opt_ff_sat.ys
+++ b/tests/opt/opt_rmdff_sat.ys
@@ -1,4 +1,4 @@
-read_verilog opt_ff_sat.v
+read_verilog opt_rmdff_sat.v
 prep -flatten
 opt_rmdff -sat
 synth