diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim
index 9a8f8f83be..b894a633c4 100644
--- a/src/nvim/testdir/test_normal.vim
+++ b/src/nvim/testdir/test_normal.vim
@@ -1125,6 +1125,8 @@ func! Test_normal19_z_spell()
   exe "lang" oldlang
   call delete("./Xspellfile.add")
   call delete("./Xspellfile2.add")
+  call delete("./Xspellfile.add.spl")
+  call delete("./Xspellfile2.add.spl")
 
   " zux -> no-op
   2
diff --git a/src/nvim/version.c b/src/nvim/version.c
index dd7318b697..487685ea2e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -105,7 +105,7 @@ static int included_patches[] = {
   // 2339,
   // 2338 NA
   2337,
-  // 2336,
+  2336,
   2335,
   // 2334,
   2333,