diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 06ddf0f3b8..20e337afcb 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -598,6 +598,7 @@ _set_missing_vimpatches() {
   # Massage arguments for git-log.
   declare -A git_log_replacements=(
     [^\(.*/\)?src/nvim/\(.*\)]="\${BASH_REMATCH[1]}src/\${BASH_REMATCH[2]}"
+    [^\(.*/\)?test/old/\(.*\)]="\${BASH_REMATCH[1]}src/\${BASH_REMATCH[2]}"
     [^\(.*/\)?\.vim-src/\(.*\)]="\${BASH_REMATCH[2]}"
   )
   local i j
diff --git a/test/old/testdir/samples/memfile_test.c b/test/old/memfile_test.c
similarity index 79%
rename from test/old/testdir/samples/memfile_test.c
rename to test/old/memfile_test.c
index 73f67fb250..41316bcc2d 100644
--- a/test/old/testdir/samples/memfile_test.c
+++ b/test/old/memfile_test.c
@@ -1,8 +1,6 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check
 // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
-// uncrustify:off
-
 /* vi:set ts=8 sts=4 sw=4 noet:
  *
  * VIM - Vi IMproved	by Bram Moolenaar
@@ -20,11 +18,11 @@
 #undef NDEBUG
 #include <assert.h>
 
-/* Must include main.c because it contains much more than just main() */
+// Must include main.c because it contains much more than just main()
 #define NO_VIM_MAIN
 #include "main.c"
 
-/* This file has to be included because the tested functions are static */
+// This file has to be included because the tested functions are static
 #include "memfile.c"
 
 #define index_to_key(i) ((i) ^ 15167)
@@ -39,26 +37,26 @@ test_mf_hash(void)
     mf_hashtab_T   ht;
     mf_hashitem_T  *item;
     blocknr_T      key;
-    size_t	   i;
-    size_t	   num_buckets;
+    long_u	   i;
+    long_u	   num_buckets;
 
     mf_hash_init(&ht);
 
-    /* insert some items and check invariants */
+    // insert some items and check invariants
     for (i = 0; i < TEST_COUNT; i++)
     {
 	assert(ht.mht_count == i);
 
-	/* check that number of buckets is a power of 2 */
+	// check that number of buckets is a power of 2
 	num_buckets = ht.mht_mask + 1;
 	assert(num_buckets > 0 && (num_buckets & (num_buckets - 1)) == 0);
 
-	/* check load factor */
+	// check load factor
 	assert(ht.mht_count <= (num_buckets << MHT_LOG_LOAD_FACTOR));
 
 	if (i < (MHT_INIT_SIZE << MHT_LOG_LOAD_FACTOR))
 	{
-	    /* first expansion shouldn't have occurred yet */
+	    // first expansion shouldn't have occurred yet
 	    assert(num_buckets == MHT_INIT_SIZE);
 	    assert(ht.mht_buckets == ht.mht_small_buckets);
 	}
@@ -71,8 +69,8 @@ test_mf_hash(void)
 	key = index_to_key(i);
 	assert(mf_hash_find(&ht, key) == NULL);
 
-	/* allocate and add new item */
-	item = (mf_hashitem_T *)lalloc_clear(sizeof(*item), FALSE);
+	// allocate and add new item
+	item = LALLOC_CLEAR_ONE(mf_hashitem_T);
 	assert(item != NULL);
 	item->mhi_key = key;
 	mf_hash_add_item(&ht, item);
@@ -81,13 +79,13 @@ test_mf_hash(void)
 
 	if (ht.mht_mask + 1 != num_buckets)
 	{
-	    /* hash table was expanded */
+	    // hash table was expanded
 	    assert(ht.mht_mask + 1 == num_buckets * MHT_GROWTH_FACTOR);
 	    assert(i + 1 == (num_buckets << MHT_LOG_LOAD_FACTOR));
 	}
     }
 
-    /* check presence of inserted items */
+    // check presence of inserted items
     for (i = 0; i < TEST_COUNT; i++)
     {
 	key = index_to_key(i);
@@ -96,7 +94,7 @@ test_mf_hash(void)
 	assert(item->mhi_key == key);
     }
 
-    /* delete some items */
+    // delete some items
     for (i = 0; i < TEST_COUNT; i++)
     {
 	if (i % 100 < 70)
@@ -119,7 +117,7 @@ test_mf_hash(void)
 	}
     }
 
-    /* check again */
+    // check again
     for (i = 0; i < TEST_COUNT; i++)
     {
 	key = index_to_key(i);
@@ -136,7 +134,7 @@ test_mf_hash(void)
 	}
     }
 
-    /* free hash table and all remaining items */
+    // free hash table and all remaining items
     mf_hash_free_all(&ht);
 }
 
diff --git a/test/old/testdir/test_syntax.vim b/test/old/testdir/test_syntax.vim
index 45230c4208..886c23efa7 100644
--- a/test/old/testdir/test_syntax.vim
+++ b/test/old/testdir/test_syntax.vim
@@ -116,7 +116,7 @@ func Test_syntime()
   let a = execute('syntime clear')
   call assert_equal("\nNo Syntax items defined for this buffer", a)
 
-  view samples/memfile_test.c
+  view ../memfile_test.c
   setfiletype cpp
   redraw
   let a = execute('syntime report')