diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 07a22418a8..6668752c42 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -126,6 +126,9 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                         print("sending: {0}".format(cmd))
                         self.request.sendall(cmd.encode('utf-8'))
                         response = "ok"
+                        # Need to wait for Vim to give up, otherwise it
+                        # sometimes fails on OS X.
+                        time.sleep(0.2)
                     elif decoded[1] == 'malformed2':
                         cmd = '"unterminated string'
                         print("sending: {0}".format(cmd))
diff --git a/src/version.c b/src/version.c
index 7089a83a96..06986069d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    122,
 /**/
     121,
 /**/