4 files changed, 13 insertions, 8 deletions
diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index 94d9536bfc..6468aa9d0a 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -11,6 +11,7 @@ local retry = helpers.retry
 local rmdir = helpers.rmdir
 local sleep = helpers.sleep
 local read_file = helpers.read_file
+local trim = helpers.trim
 
 describe('fileio', function()
   before_each(function()
@@ -79,11 +80,11 @@ describe('fileio', function()
     feed('Abar<esc>')
     command('write')
 
-    local foo_contents = read_file('Xtest_startup_file1')
-    local bar_contents = read_file('Xtest_startup_file1~')
+    local foobar_contents = trim(read_file('Xtest_startup_file1'))
+    local bar_contents = trim(read_file('Xtest_startup_file1~'))
 
-    eq('foobar\n', foo_contents);
-    eq('foo\n', bar_contents);
+    eq('foobar', foobar_contents);
+    eq('foo', bar_contents);
 
   end)
 end)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 3e72ba6f98..9d82ce9c0d 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -25,6 +25,7 @@ local read_file = global_helpers.read_file
 local sleep = global_helpers.sleep
 local table_flatten = global_helpers.table_flatten
 local write_file = global_helpers.write_file
+local trim = global_helpers.trim
 
 local start_dir = lfs.currentdir()
 -- XXX: NVIM_PROG takes precedence, QuickBuild sets it.
@@ -797,6 +798,7 @@ local module = {
   window = window,
   winmeths = winmeths,
   write_file = write_file,
+  trim = trim,
 }
 
 return function(after_each)
diff --git a/test/helpers.lua b/test/helpers.lua
index e4c3019adc..3a766b99f5 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -731,6 +731,10 @@ local function read_nvim_log()
   return log
 end
 
+local function trim(s)
+  return s:match('^%s*(.*%S)') or ''
+end
+
 local module = {
   REMOVE_THIS = REMOVE_THIS,
   argss_to_cmd = argss_to_cmd,
@@ -772,6 +776,7 @@ local module = {
   updated = updated,
   which = which,
   write_file = write_file,
+  trim = trim,
 }
 
 return module
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index beb25f25db..1345fbce17 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -16,6 +16,7 @@ local neq = global_helpers.neq
 local map = global_helpers.map
 local eq = global_helpers.eq
 local ok = global_helpers.ok
+local trim = global_helpers.trim
 
 -- C constants.
 local NULL = ffi.cast('void*', 0)
@@ -120,10 +121,6 @@ local deinit = only_separate(function()
   end
 end)
 
-local function trim(s)
-  return s:match('^%s*(.*%S)') or ''
-end
-
 -- a Set that keeps around the lines we've already seen
 local cdefs_init = Set:new()
 local cdefs_mod = nil