diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 877c5f9..d47a355 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -260,6 +260,16 @@
   return has('gui') && ($DISPLAY != "" || has('gui_running'))
 endfunc
 
+func WorkingClipboard()
+  if !has('clipboard')
+    return 0
+  endif
+  if has('x11')
+    return $DISPLAY != ""
+  endif
+  return 1
+endfunc
+
 " Get line "lnum" as displayed on the screen.
 " Trailing white space is trimmed.
 func! Screenline(lnum)
diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim
index 6450989..65f300c 100644
--- a/src/testdir/test_paste.vim
+++ b/src/testdir/test_paste.vim
@@ -6,6 +6,8 @@
 endif
 set term=xterm
 
+source shared.vim
+
 func Test_paste_normal_mode()
   new
   " In first column text is inserted
@@ -67,7 +69,7 @@
 endfunc
 
 func Test_paste_clipboard()
-  if !has('clipboard')
+  if !WorkingClipboard()
     return
   endif
   let @+ = "nasty\<Esc>:!ls\<CR>command"
diff --git a/src/version.c b/src/version.c
index d1fd6ea..36e94b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1604,
+/**/
     1603,
 /**/
     1602,