diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 1c4ceadb4c..734039aca1 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -68,7 +68,8 @@ function /^Test_
 redir END
 let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
 
-for test in tests
+" Execute the tests in alphabetical order.
+ for test in sort(tests)
   if exists("*SetUp")
     call SetUp()
   endif
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 6910a8b294..fb05b7d780 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -72,7 +72,7 @@ endfunction
 
 " Tests for the :colder, :cnewer, :lolder and :lnewer commands
 " Note that this test assumes that a quickfix/location list is
-" already set by previous tests
+" already set by the caller.
 function XageTests(cchar)
   let Xolder = a:cchar . 'older'
   let Xnewer = a:cchar . 'newer'
@@ -116,7 +116,11 @@ function XageTests(cchar)
 endfunction
 
 function Test_cage()
+  let list = [{'bufnr': 1, 'lnum': 1}]
+  call setqflist(list)
   call XageTests('c')
+
+  call setloclist(0, list)
   call XageTests('l')
 endfunction
 
diff --git a/src/version.c b/src/version.c
index af26ae3706..b1269e19a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1071,
 /**/
     1070,
 /**/