diff --git a/src/testdir/dumps/Test_number_insert_delete_lines_1.dump b/src/testdir/dumps/Test_number_insert_delete_lines_1.dump
new file mode 100644
index 0000000..5aecb46
--- /dev/null
+++ b/src/testdir/dumps/Test_number_insert_delete_lines_1.dump
@@ -0,0 +1,8 @@
+| +0#af5f00255#ffffff0@1|1| |1+0#0000000&| @69
+| +0#af5f00255&@1|2| >2+0#0000000&| @69
+| +0#af5f00255&@1|3| |3+0#0000000&| @69
+| +0#af5f00255&@1|4| |4+0#0000000&| @69
+| +0#af5f00255&@1|5| |5+0#0000000&| @69
+| +0#af5f00255&@1|6| |6+0#0000000&| @69
+| +0#af5f00255&@1|7| |7+0#0000000&| @69
+@57|2|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_number_insert_delete_lines_2.dump b/src/testdir/dumps/Test_number_insert_delete_lines_2.dump
new file mode 100644
index 0000000..dea68e8
--- /dev/null
+++ b/src/testdir/dumps/Test_number_insert_delete_lines_2.dump
@@ -0,0 +1,8 @@
+| +0#af5f00255#ffffff0@1|1| |1+0#0000000&| @69
+| +0#af5f00255&@1|2| >3+0#0000000&| @69
+| +0#af5f00255&@1|3| |4+0#0000000&| @69
+| +0#af5f00255&@1|4| |5+0#0000000&| @69
+| +0#af5f00255&@1|5| |6+0#0000000&| @69
+| +0#af5f00255&@1|6| |7+0#0000000&| @69
+|~+0#4040ff13&| @73
+| +0#0000000&@56|2|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_number_insert_delete_lines_3.dump b/src/testdir/dumps/Test_number_insert_delete_lines_3.dump
new file mode 100644
index 0000000..fff3297
--- /dev/null
+++ b/src/testdir/dumps/Test_number_insert_delete_lines_3.dump
@@ -0,0 +1,8 @@
+| +0#af5f00255#ffffff0@1|1| |1+0#0000000&| @69
+| +0#af5f00255&@1|2| >4+0#0000000&| @69
+| +0#af5f00255&@1|3| |5+0#0000000&| @69
+| +0#af5f00255&@1|4| |6+0#0000000&| @69
+| +0#af5f00255&@1|5| |7+0#0000000&| @69
+|~+0#4040ff13&| @73
+|~| @73
+| +0#0000000&@56|2|,|1| @10|A|l@1| 
diff --git a/src/testdir/test_number.vim b/src/testdir/test_number.vim
index 6ac3c4c..b57c1ed 100644
--- a/src/testdir/test_number.vim
+++ b/src/testdir/test_number.vim
@@ -146,8 +146,7 @@
   call s:close_windows()
 endfunc
 
-" Pending: https://groups.google.com/forum/#!topic/vim_dev/tzNKP7EDWYI
-func XTest_number_with_linewrap2()
+func Test_number_with_linewrap2()
   call s:test_windows(3, 20)
   normal! 61ia
   setl number wrap
@@ -164,8 +163,7 @@
   call s:close_windows()
 endfunc
 
-" Pending: https://groups.google.com/forum/#!topic/vim_dev/tzNKP7EDWYI
-func XTest_number_with_linewrap3()
+func Test_number_with_linewrap3()
   call s:test_windows(4, 20)
   normal! 81ia
   setl number wrap
@@ -174,7 +172,7 @@
   call s:validate_cursor()
   let lines = s:screen_lines(1, 4)
   let expect = [
-\ "aaaaaaaa",
+\ "<<<aaaaa",
 \ "aaaaaaaa",
 \ "aaaaaaaa",
 \ "a       ",
@@ -349,6 +347,31 @@
   call StopVimInTerminal(buf)
 endfunc
 
+" Test that line numbers below inserted/deleted lines are updated.
+func Test_number_insert_delete_lines()
+  CheckScreendump
+
+  let lines =<< trim END
+      call setline(1, range(1, 7))
+      set number
+      call cursor(2, 1)
+  END
+  call writefile(lines, 'Xnumber_insert_delete_lines', 'D')
+
+  let buf = RunVimInTerminal('-S Xnumber_insert_delete_lines', #{rows: 8})
+  call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_1', {})
+  call term_sendkeys(buf, "dd")
+  call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_2', {})
+  call term_sendkeys(buf, "P")
+  call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_1', {})
+  call term_sendkeys(buf, "2dd")
+  call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_3', {})
+  call term_sendkeys(buf, "P")
+  call VerifyScreenDump(buf, 'Test_number_insert_delete_lines_1', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 " Test for displaying line numbers with 'rightleft'
 func Test_number_rightleft()
   CheckFeature rightleft