diff --git a/test/functional/ex_cmds/digraphs_spec.lua b/test/functional/ex_cmds/digraphs_spec.lua
index 5de2adc191..77ebfd19e2 100644
--- a/test/functional/ex_cmds/digraphs_spec.lua
+++ b/test/functional/ex_cmds/digraphs_spec.lua
@@ -7,7 +7,7 @@ local Screen = require('test.functional.ui.screen')
 describe(':digraphs', function()
   local screen
   before_each(function()
-    clear()
+    clear{args_rm={'--headless'}}
     screen = Screen.new(65, 8)
     screen:set_default_attr_ids({
       [1] = {bold = true, foreground = Screen.colors.Blue1},
diff --git a/test/functional/ex_cmds/grep_spec.lua b/test/functional/ex_cmds/grep_spec.lua
index 43ef1bd424..34fea433ce 100644
--- a/test/functional/ex_cmds/grep_spec.lua
+++ b/test/functional/ex_cmds/grep_spec.lua
@@ -3,7 +3,9 @@ local clear, feed_command, feed, ok, eval =
   helpers.clear, helpers.feed_command, helpers.feed, helpers.ok, helpers.eval
 
 describe(':grep', function()
-  before_each(clear)
+  before_each(function()
+    clear{args_rm={'--headless'}}
+  end)
 
   it('does not hang on large input #2983', function()
     if eval("executable('grep')") == 0 then