diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 5e1d641..e1d9999 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -186,6 +186,17 @@
   let g:func_start = reltime()
 endif
 
+" Invoked when a test takes too much time.
+func TestTimeout(id)
+  split test.log
+  call append(line('$'), '')
+  call append(line('$'), 'Test timed out: ' .. g:testfunc)
+  write
+  call add(v:errors, 'Test timed out: ' . g:testfunc)
+
+  cquit! 42
+endfunc
+
 func RunTheTest(test)
   let prefix = ''
   if has('reltime')
@@ -194,6 +205,12 @@
   endif
   echoconsole prefix .. 'Executing ' .. a:test
 
+  if has('timers')
+    " No test should take longer than 30 seconds.  If it takes longer we
+    " assume we are stuck and need to break out.
+    let test_timeout_timer = timer_start(30000, 'TestTimeout')
+  endif
+
   " Avoid stopping at the "hit enter" prompt
   set nomore
 
@@ -259,6 +276,10 @@
     endtry
   endif
 
+  if has('timers')
+    call timer_stop(test_timeout_timer)
+  endif
+
   " Clear any autocommands and put back the catch-all for SwapExists.
   au!
   au SwapExists * call HandleSwapExists()
diff --git a/src/version.c b/src/version.c
index fb34719..20ed2d7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    561,
+/**/
     560,
 /**/
     559,