diff --git a/cli/tests/test_next_prev_commands.rs b/cli/tests/test_next_prev_commands.rs
index 10fea8f48b..136d37d11b 100644
--- a/cli/tests/test_next_prev_commands.rs
+++ b/cli/tests/test_next_prev_commands.rs
@@ -13,6 +13,8 @@
 // limitations under the License.
 //
 
+use std::path::Path;
+
 use crate::common::{get_stderr_string, get_stdout_string, TestEnvironment};
 
 #[test]
@@ -60,7 +62,6 @@ fn test_next_multiple() {
     Parent commit      : zsuskuln 009f88bf (empty) fourth
     "###);
 }
-
 #[test]
 fn test_prev_simple() {
     // Move from third => second.
@@ -70,18 +71,55 @@ fn test_prev_simple() {
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
+    // @ is an empty discardable commit created by `jj commit`.
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  zsuskulnrvyr
+    ◉  kkmpptxzrspx third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev"]);
-    // The working copy commit is now a child of "second".
+    // The working copy commit is now a child of "second", even though the
+    // commit before our empty working copy commit is actually "third". This is
+    // because we skip the empty discardable @ commit when deciding how far to
+    // move backwards.
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Working copy now at: mzvwutvl f7a0f876 (empty) (no description set)
+    Working copy now at: royxmykx 5647d685 (empty) (no description set)
     Parent commit      : rlvkpnrz 5c52832c (empty) second
     "###);
 }
 
+#[test]
+fn test_prev_non_discardable_working_copy() {
+    // Move from third => second.
+    let test_env = TestEnvironment::default();
+    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
+    let repo_path = test_env.env_root().join("repo");
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
+    test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
+    test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "third"]);
+    // @ is NOT discardable because we described it.
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  kkmpptxzrspx third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+
+    let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev"]);
+    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stderr, @r###"
+    Working copy now at: royxmykx f04d8595 (empty) (no description set)
+    Parent commit      : qpvuntsm 69542c19 (empty) first
+    "###);
+}
+
 #[test]
 fn test_prev_multiple_without_root() {
-    // Move from fourth => second.
+    // Move from fourth => first.
     let test_env = TestEnvironment::default();
     test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
     let repo_path = test_env.env_root().join("repo");
@@ -89,11 +127,20 @@ fn test_prev_multiple_without_root() {
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fourth"]);
+    test_env.jj_cmd_ok(&repo_path, &["edit", "description(fourth)"]);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  zsuskulnrvyr fourth
+    ◉  kkmpptxzrspx third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev", "2"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Working copy now at: royxmykx 5647d685 (empty) (no description set)
-    Parent commit      : rlvkpnrz 5c52832c (empty) second
+    Working copy now at: vruxwmqv bcea672c (empty) (no description set)
+    Parent commit      : qpvuntsm 69542c19 (empty) first
     "###);
 }
 
@@ -220,6 +267,17 @@ fn test_prev_fails_on_merge_commit() {
     test_env.jj_cmd_ok(&repo_path, &["branch", "c", "right"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
     test_env.jj_cmd_ok(&repo_path, &["new", "left", "right"]);
+
+    // Check that the graph looks the way we expect.
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @    yqosqzytrlsw
+    ├─╮
+    │ ◉  zsuskulnrvyr right second
+    ◉ │  qpvuntsmwlqt left first
+    ├─╯
+    ◉  zzzzzzzzzzzz
+    "###);
+
     // Try to advance the working copy commit.
     let stderr = test_env.jj_cmd_failure(&repo_path, &["prev"]);
     insta::assert_snapshot!(stderr,@r###"
@@ -228,7 +286,7 @@ fn test_prev_fails_on_merge_commit() {
 }
 
 #[test]
-fn test_prev_fails_on_multiple_parents() {
+fn test_prev_prompts_on_multiple_parents() {
     let test_env = TestEnvironment::default();
     test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
     let repo_path = test_env.env_root().join("repo");
@@ -240,7 +298,21 @@ fn test_prev_fails_on_multiple_parents() {
     // Create a merge commit, which has two parents.
     test_env.jj_cmd_ok(&repo_path, &["new", "all:@--+"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "merge"]);
-    // Advance the working copy commit.
+
+    // Check that the graph looks the way we expect.
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  vruxwmqvtpmx
+    ◉      yqosqzytrlsw merge
+    ├─┬─╮
+    │ │ ◉  qpvuntsmwlqt first
+    │ ◉ │  kkmpptxzrspx second
+    │ ├─╯
+    ◉ │  mzvwutvlkqwt third
+    ├─╯
+    ◉  zzzzzzzzzzzz
+    "###);
+
+    // Move @ backwards.
     let (stdout, stderr) = test_env.jj_cmd_stdin_ok(&repo_path, &["prev"], "3\n");
     insta::assert_snapshot!(stdout,@r###"
     ambiguous prev commit, choose one to target:
@@ -251,7 +323,7 @@ fn test_prev_fails_on_multiple_parents() {
     enter the index of the commit you want to target: 
     "###);
     insta::assert_snapshot!(stderr,@r###"
-    Working copy now at: yostqsxw 286a9951 (empty) (no description set)
+    Working copy now at: znkkpsqq 94715f3c (empty) (no description set)
     Parent commit      : qpvuntsm 69542c19 (empty) first
     "###);
 }
@@ -265,10 +337,18 @@ fn test_prev_onto_root_fails() {
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fourth"]);
-    // The root commit is before "first".
-    let stderr = test_env.jj_cmd_failure(&repo_path, &["prev", "6"]);
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  mzvwutvlkqwt
+    ◉  zsuskulnrvyr fourth
+    ◉  kkmpptxzrspx third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+    // The root commit is before "first", which is 5 commits back.
+    let stderr = test_env.jj_cmd_failure(&repo_path, &["prev", "5"]);
     insta::assert_snapshot!(stderr,@r###"
-    Error: No ancestor found 6 commits back
+    Error: No ancestor found 5 commits back
     "###);
 }
 
@@ -282,18 +362,30 @@ fn test_prev_editing() {
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
     test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fourth"]);
+    // Edit the "fourth" commit, which becomes the tip when the empty @ commit
+    // is dropped.
+    test_env.jj_cmd_ok(&repo_path, &["edit", "@-"]);
+    // Check that the graph looks the way we expect.
+    insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
+    @  zsuskulnrvyr fourth
+    ◉  kkmpptxzrspx third
+    ◉  rlvkpnrzqnoo second
+    ◉  qpvuntsmwlqt first
+    ◉  zzzzzzzzzzzz
+    "###);
+
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev", "--edit"]);
-    insta::assert_snapshot!(stdout, @"");
+    insta::assert_snapshot!(stdout, @r"");
     insta::assert_snapshot!(stderr, @r###"
-    Working copy now at: zsuskuln 009f88bf (empty) fourth
-    Parent commit      : kkmpptxz 3fa8931e (empty) third
+    Working copy now at: kkmpptxz 3fa8931e (empty) third
+    Parent commit      : rlvkpnrz 5c52832c (empty) second
     "###);
     // --edit is implied when already editing a non-head commit
     let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev"]);
     insta::assert_snapshot!(stdout, @"");
     insta::assert_snapshot!(stderr, @r###"
-    Working copy now at: yqosqzyt d2edc95b (empty) (no description set)
-    Parent commit      : rlvkpnrz 5c52832c (empty) second
+    Working copy now at: rlvkpnrz 5c52832c (empty) second
+    Parent commit      : qpvuntsm 69542c19 (empty) first
     "###);
 }
 
@@ -322,3 +414,8 @@ fn test_next_editing() {
     Parent commit      : kkmpptxz 3fa8931e (empty) third
     "###);
 }
+
+fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
+    let template = r#"separate(" ", change_id.short(), local_branches, description)"#;
+    test_env.jj_cmd_success(cwd, &["log", "-T", template])
+}