diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb
index 0a798b27e9..f527c453bd 100644
--- a/Library/Homebrew/formula_cellar_checks.rb
+++ b/Library/Homebrew/formula_cellar_checks.rb
@@ -1,3 +1,5 @@
+require "utils/shell"
+
 module FormulaCellarChecks
   def check_PATH(bin)
     # warn the user if stuff was installed outside of their PATH
@@ -12,7 +14,7 @@ module FormulaCellarChecks
 
     <<-EOS.undent
       #{prefix_bin} is not in your PATH
-      You can amend this by altering your #{shell_profile} file
+      You can amend this by altering your #{Utils::Shell.shell_profile} file
     EOS
   end
 
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 4c03303406..1a5db6b6f3 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -238,7 +238,7 @@ class IntegrationCommandTests < Homebrew::TestCase
   end
 
   def test_env_csh
-    assert_match %r{setenv CMAKE_PREFIX_PATH},
+    assert_match %r{setenv CMAKE_PREFIX_PATH #{Regexp.quote(HOMEBREW_PREFIX.to_s)}},
                  cmd("--env", "--shell=tcsh")
   end
 
diff --git a/Library/Homebrew/test/test_shell.rb b/Library/Homebrew/test/test_shell.rb
index 63ca5adaa3..5a10574579 100644
--- a/Library/Homebrew/test/test_shell.rb
+++ b/Library/Homebrew/test/test_shell.rb
@@ -30,7 +30,7 @@ class ShellSmokeTest < Homebrew::TestCase
   def test_csh_quote()
     assert_equal "''", Utils::Shell.csh_quote("")
     assert_equal "\\\\", Utils::Shell.csh_quote("\\")
-    # note this test is different
+    # note this test is different than for sh
     assert_equal "'\\\n'", Utils::Shell.csh_quote("\n")
     assert_equal "\\$", Utils::Shell.csh_quote("$")
     assert_equal "word", Utils::Shell.csh_quote("word")