diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index b306b5850d6c1bdfa70f292b3ae86bccb6ab9985..877b7880ebedc8adeb5e84d491999f6add9c9ef1 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -381,8 +381,7 @@ end
 end
 
 def check_access_logs
-  folder = Pathname.new('~/Library/Logs/Homebrew')
-  if folder.exist? and not folder.writable_real?
+  if HOMEBREW_LOGS.exist? and not HOMEBREW_LOGS.writable_real?
     <<-EOS.undent
       #{folder} isn't writable.
       This can happen if you "sudo make install" software that isn't managed
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index f57235cca1764a500457f49fbcd0797a062b2df1..a0c0bf004872b3421d35ef437117a8a142413a5f 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -200,7 +200,7 @@ class BuildError < Homebrew::InstallationError
       Homebrew.dump_build_env(env)
       puts
       onoe "#{formula.name} did not build"
-      unless (logs = Dir["#{ENV['HOME']}/Library/Logs/Homebrew/#{formula}/*"]).empty?
+      unless (logs = Dir["#{HOMEBREW_LOGS}/#{formula}/*"]).empty?
         puts "Logs:"
         puts logs.map{|fn| "     #{fn}"}.join("\n")
       end