diff --git a/.travis.yml b/.travis.yml
index 8ecc1d9ac8..f4c7d2b074 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
   - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot
 
 script:
-  - brew test-bot
+  - travis_wait 60 brew test-bot
 
 notifications:
   slack: machomebrew:1XNF7p1JRCdBUuKaeSwsWEc1
diff --git a/Library/Homebrew/compat/requirements/x11_requirement.rb b/Library/Homebrew/compat/requirements/x11_requirement.rb
index bad1f2c73c..4474784548 100644
--- a/Library/Homebrew/compat/requirements/x11_requirement.rb
+++ b/Library/Homebrew/compat/requirements/x11_requirement.rb
@@ -4,8 +4,7 @@ class X11Requirement < Requirement
   module Compat
     def initialize(tags = [])
       if tags.first.to_s.match?(/(\d\.)+\d/)
-        # TODO: deprecate when Homebrew/homebrew-core is fixed.
-        # odeprecated('depends_on :x11 => "X.Y.Z"')
+        odeprecated('depends_on :x11 => "X.Y.Z"')
         tags.shift
       end
 
diff --git a/Library/Homebrew/compat/requirements/xcode_requirement.rb b/Library/Homebrew/compat/requirements/xcode_requirement.rb
index 1ceebd2e05..490d157091 100644
--- a/Library/Homebrew/compat/requirements/xcode_requirement.rb
+++ b/Library/Homebrew/compat/requirements/xcode_requirement.rb
@@ -8,8 +8,7 @@ class XcodeRequirement < Requirement
       else
         tags.find do |tag|
           next unless tag.to_s.match?(/(\d\.)+\d/)
-          # TODO: deprecate when Homebrew/homebrew-core is fixed.
-          # odeprecated('depends_on :xcode => [..., "X.Y.Z"]')
+          odeprecated('depends_on :xcode => [..., "X.Y.Z"]')
           tags.delete(tag)
         end
       end