diff --git a/src/edit_mode/vi/command.rs b/src/edit_mode/vi/command.rs
index 0e8e3c7..19fa6f1 100644
--- a/src/edit_mode/vi/command.rs
+++ b/src/edit_mode/vi/command.rs
@@ -419,8 +419,10 @@ mod test {
         #[case] last_to_till: Option<ViToTill>,
         #[case] expected: Option<Command>,
     ) {
-        let mut vi = Vi::default();
-        vi.last_to_till = last_to_till;
+        let vi = Vi {
+            last_to_till,
+            ..Vi::default()
+        };
 
         let input = vec![input];
 
diff --git a/src/edit_mode/vi/mod.rs b/src/edit_mode/vi/mod.rs
index 3276a6a..7b09245 100644
--- a/src/edit_mode/vi/mod.rs
+++ b/src/edit_mode/vi/mod.rs
@@ -327,8 +327,10 @@ mod test {
         #[case] modifiers: KeyModifiers,
         #[case] expected: ViToTill,
     ) {
-        let mut vi = Vi::default();
-        vi.mode = ViMode::Normal;
+        let mut vi = Vi {
+            mode: ViMode::Normal,
+            ..Vi::default()
+        };
 
         let to_till = Event::Key(KeyEvent {
             code: KeyCode::Char(code),