diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
index 0218e1c80d..495ea8ec8a 100644
--- a/Library/Homebrew/cmd/test.rb
+++ b/Library/Homebrew/cmd/test.rb
@@ -57,12 +57,10 @@ module Homebrew
           args << "--devel"
         end
 
-        if Sandbox.available? && !ARGV.no_sandbox?
-          Sandbox.print_sandbox_message
-        end
+        Sandbox.print_sandbox_message if Sandbox.test?
 
         Utils.safe_fork do
-          if Sandbox.available? && !ARGV.no_sandbox?
+          if Sandbox.test?
             sandbox = Sandbox.new
             f.logs.mkpath
             sandbox.record_log(f.logs/"sandbox.test.log")