3 files changed, 16 insertions, 2 deletions
diff --git a/test/functional/eval/msgpack_functions_spec.lua b/test/functional/eval/msgpack_functions_spec.lua
index 927d17fca9..943bdfca30 100644
--- a/test/functional/eval/msgpack_functions_spec.lua
+++ b/test/functional/eval/msgpack_functions_spec.lua
@@ -565,6 +565,18 @@ describe('msgpackdump() function', function()
        exc_exec('call msgpackdump([todump])'))
   end)
 
+  it('can dump dict with two same dicts inside', function()
+    execute('let inter = {}')
+    execute('let todump = {"a": inter, "b": inter}')
+    eq({"\130\161a\128\161b\128"}, eval('msgpackdump([todump])'))
+  end)
+
+  it('can dump list with two same lists inside', function()
+    execute('let inter = []')
+    execute('let todump = [inter, inter]')
+    eq({"\146\144\144"}, eval('msgpackdump([todump])'))
+  end)
+
   it('fails to dump a recursive list in a special dict', function()
     execute('let todump = {"_TYPE": v:msgpack_types.array, "_VAL": []}')
     execute('call add(todump._VAL, todump)')
diff --git a/test/functional/legacy/074_global_var_in_viminfo_spec.lua b/test/functional/legacy/074_global_var_in_viminfo_spec.lua
index 180071118a..a89a4181cd 100644
--- a/test/functional/legacy/074_global_var_in_viminfo_spec.lua
+++ b/test/functional/legacy/074_global_var_in_viminfo_spec.lua
@@ -12,7 +12,8 @@ describe('storing global variables in viminfo files', function()
   end)
 
   it('is working', function()
-    local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '--embed'})
+    local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE',
+                                 '-i', 'Xviminfo', '--embed'})
     helpers.set_session(nvim2)
 
     local test_dict = {foo = 1, bar = 0, longvarible = 1000}
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 7ba82c8b7b..092cc8c126 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -551,7 +551,8 @@ describe('Screen', function()
       ]])
     end)
 
-    it('has minimum width/height values', function()
+    -- FIXME this has some race conditions that cause it to fail periodically
+    pending('has minimum width/height values', function()
       screen:try_resize(1, 1)
       screen:expect([[
         -- INS^ERT --|