diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 6d30cd294693ef84fad26aa93a2041adc6e6f4e1..3e0c1d04d0b10daab35ddb1f6c9b375e026a9c3d 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -53,8 +53,8 @@ module Homebrew
         return unless MacOS::Xcode.installed?
         return unless MacOS::Xcode.outdated?
 
-        # Travis CI images are going to end up outdated so don't complain.
-        return if ENV["TRAVIS"]
+        # CI images are going to end up outdated so don't complain.
+        return if ENV["TRAVIS"] || ENV["CIRCLECI"]
 
         message = <<-EOS.undent
           Your Xcode (#{MacOS::Xcode.version}) is outdated.