2 files changed, 13 insertions, 26 deletions
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 730c77c2ba..42a70c9f6a 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -703,23 +703,14 @@ describe('ui/ext_messages', function()
       end
     end}
   end)
-end)
 
-describe('ui/ext_messages', function()
-  local screen
-  before_each(function()
-    clear()
+  it('wildmode=list', function()
+    local default_attr = screen:get_default_attr_ids()
+    screen:detach()
     screen = Screen.new(25, 7)
     screen:attach({rgb=true, ext_messages=true})
-    screen:set_default_attr_ids({
-      [1] = {bold = true, foreground = Screen.colors.Blue1},
-      [2] = {foreground = Screen.colors.Grey100, background = Screen.colors.Red},
-      [3] = {bold = true, reverse = true},
-      [4] = {bold = true, foreground = Screen.colors.SeaGreen4},
-    })
-  end)
+    screen:set_default_attr_ids(default_attr)
 
-  it('wildmode=list', function()
     command('set wildmenu wildmode=list')
     feed(':set wildm<tab>')
     screen:expect{grid=[[
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index f960b793c9..75b5ea9476 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -167,22 +167,13 @@ describe("'wildmenu'", function()
     -- system-dependent.
     expect_stay_unchanged{any='!  #  &  <  =  >  @  >   |\n:!^'}
   end)
-end)
 
-describe("'wildmenu'", function()
-  local screen
-  before_each(function()
-    clear()
-    -- screen needs to be more than 5 rows
-    -- otherwise the tabline is covered and will be redrawn
+  it('wildmode=list,full and display+=msgsep interaction #10092', function()
+    -- Need more than 5 rows, else tabline is covered and will be redrawn.
+    screen:detach()
     screen = Screen.new(25, 7)
     screen:attach()
-  end)
-  after_each(function()
-    screen:detach()
-  end)
 
-  it('wildmode=list,full and display+=msgsep interact correctly #10092', function()
     command('set display+=msgsep')
     command('set wildmenu wildmode=list,full')
     command('set showtabline=2')
@@ -218,7 +209,12 @@ describe("'wildmenu'", function()
     ]])
   end)
 
-  it('wildmode=list,full and display-=msgsep interact correctly', function()
+  it('wildmode=list,full and display-=msgsep interaction', function()
+    -- Need more than 5 rows, else tabline is covered and will be redrawn.
+    screen:detach()
+    screen = Screen.new(25, 7)
+    screen:attach()
+
     command('set display-=msgsep')
     command('set wildmenu wildmode=list,full')
     feed(':set wildm<tab>')