diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index c98fc02..58ced56 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -11,6 +11,17 @@
   if cmd == ''
     return
   endif
+  if has('unix')
+    try
+      call remote_send('xxx', '')
+    catch
+      if v:exception =~ 'E240:'
+	" No connection to the X server, give up.
+	return
+      endif
+      " ignore other errors
+    endtry
+  endif
 
   let name = 'XVIMTEST'
   let cmd .= ' --servername ' . name
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index d0dd04f..6e4e4ca 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -39,6 +39,15 @@
   if cmd == ''
     return 'GetVimCommand() failed'
   endif
+  try
+    call remote_send('xxx', '')
+  catch
+    if v:exception =~ 'E240:'
+      " No connection to the X server, give up.
+      return
+    endif
+    " ignore other errors
+  endtry
 
   let name = 'XVIMCLIPBOARD'
   let cmd .= ' --servername ' . name
diff --git a/src/version.c b/src/version.c
index e19da86..1f82ee1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    507,
+/**/
     506,
 /**/
     505,