diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index 732cc60..0888e60 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -1045,7 +1045,7 @@
   bwipe!
 endfunc
 
-" Test for W23 when clipboard is not available
+" Test for W24 when clipboard support is not available
 func Test_clipboard_regs_not_working()
   CheckNotGui
   if !has("clipboard")
@@ -1057,4 +1057,29 @@
   endif
 endfunc
 
+" Check for W23 with a Vim with clipboard support,
+" but when the connection to the X11 server does not work
+func Test_clipboard_regs_not_working2()
+  CheckNotMac
+  CheckRunVimInTerminal
+  CheckFeature clipboard
+  let display=$DISPLAY
+  unlet $DISPLAY
+  " Run in a separate Vim instance because changing 'encoding' may cause
+  " trouble for later tests.
+  let lines =<< trim END
+      unlet $DISPLAY
+      call setline(1, 'abcdefg')
+      let a=execute(':norm! "+yy')
+      call writefile([a], 'Xclipboard_result.txt')
+  END
+  call writefile(lines, 'XTest_clipboard', 'D')
+  let buf = RunVimInTerminal('-S XTest_clipboard', {})
+  call term_sendkeys(buf, "\"+yy")
+  call StopVimInTerminal(buf)
+  let result = readfile('Xclipboard_result.txt')
+  call assert_match("^\\nW23:", result[0])
+  let $DISPLAY=display
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index dbd5fc6..3eb9769 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    872,
+/**/
     871,
 /**/
     870,