3 files changed, 10 insertions, 2 deletions
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index e4b6621ff9..75b50aad0a 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -508,7 +508,9 @@ describe('jobs', function()
 
     it('jobclose() sends SIGHUP', function()
       nvim('command', 'call jobclose(j)')
-      eq({'notification', 'exit', {0, 42}}, next_msg())
+      local msg = next_msg()
+      msg = (msg[2] == 'stdout') and next_msg() or msg  -- Skip stdout, if any.
+      eq({'notification', 'exit', {0, 42}}, msg)
     end)
   end)
 end)
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 91da459393..3564f76442 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -36,6 +36,7 @@ local function filter_complex_blocks(body)
             or string.find(line, "_ISwupper", 1, true)
             or string.find(line, "msgpack_zone_push_finalizer")
             or string.find(line, "msgpack_unpacker_reserve_buffer")
+            or string.find(line, "UUID_NULL")  -- static const uuid_t UUID_NULL = {...}
             or string.find(line, "inline _Bool")) then
       result[#result + 1] = line
     end
diff --git a/test/unit/preprocess.lua b/test/unit/preprocess.lua
index e5c838b13b..10ba997758 100644
--- a/test/unit/preprocess.lua
+++ b/test/unit/preprocess.lua
@@ -105,7 +105,12 @@ local Gcc = {
    '-DINCLUDE_GENERATED_DECLARATIONS',
 
    -- Needed for FreeBSD
-   '-D "_Thread_local="'
+   '-D "_Thread_local="',
+
+   -- Needed for macOS Sierra
+   '-D "_Nullable="',
+   '-D "_Nonnull="',
+   '-U__BLOCKS__',
   }
 }