diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index ba80cbc78b..063558f19f 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -14,14 +14,14 @@ module Homebrew
       end
 
       def fatal_development_tools_checks
-        if ENV["TRAVIS"] || ARGV.homebrew_developer?
-          %w[
-          ]
-        else
+        if MacOS.version >= :sierra && ENV["CI"].nil?
           %w[
             check_xcode_up_to_date
             check_clt_up_to_date
           ]
+        else
+          %w[
+          ]
         end
       end