3 files changed, 18 insertions, 5 deletions
diff --git a/test/functional/eval/input_spec.lua b/test/functional/eval/input_spec.lua
index e774b939f7..14c02f9eb2 100644
--- a/test/functional/eval/input_spec.lua
+++ b/test/functional/eval/input_spec.lua
@@ -462,7 +462,7 @@ describe('confirm()', function()
     -- With shortmess-=F
     command('set shortmess-=F')
     feed(':edit foo<cr>')
-    check_and_clear('"foo" [New File]         |\n')
+    check_and_clear('"foo" [New]              |\n')
 
     -- With shortmess+=F
     command('set shortmess+=F')
diff --git a/test/functional/eval/let_spec.lua b/test/functional/eval/let_spec.lua
index f8fcdfd41f..5bc703b567 100644
--- a/test/functional/eval/let_spec.lua
+++ b/test/functional/eval/let_spec.lua
@@ -75,4 +75,19 @@ describe(':let', function()
     command(cmd_get_child_env)
     eq(eval('$NVIM_TEST'), eval('g:env_from_child'))
   end)
+
+  it("release of list assigned to l: variable does not trigger assertion #12387, #12430", function()
+    source([[
+      func! s:f()
+        let l:x = [1]
+        let g:x = l:
+      endfunc
+      for _ in range(2)
+        call s:f()
+      endfor
+      call garbagecollect()
+      call feedkeys('i', 't')
+    ]])
+    eq(1, eval('1'))
+  end)
 end)
diff --git a/test/functional/eval/null_spec.lua b/test/functional/eval/null_spec.lua
index afe999e1fa..db0a706319 100644
--- a/test/functional/eval/null_spec.lua
+++ b/test/functional/eval/null_spec.lua
@@ -47,10 +47,8 @@ describe('NULL', function()
 
     -- Subjectable behaviour
 
-    -- FIXME Should return 1
-    null_expr_test('is equal to empty list', 'L == []', 0, 0)
-    -- FIXME Should return 1
-    null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 0)
+    null_expr_test('is equal to empty list', 'L == []', 0, 1)
+    null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 1)
 
     -- Correct behaviour
     null_expr_test('can be indexed with error message for empty list', 'L[0]',