diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index 6d98786..1597495 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -140,7 +140,7 @@ function fail_if_not_on_cryptlist() {
 
   if ! is_on_cryptlist "$name" ; then
     echo "ERROR: $name not found in $BB_FILES" >&2
-    echo "PWD=$(/bin/pwd)" >&2
+    echo "PWD=$(/usr/bin/env pwd)" >&2
     echo 'Exiting...' >&2
     exit 1
   fi
diff --git a/blackbox.plugin.zsh b/blackbox.plugin.zsh
index a1017ab..affa570 100755
--- a/blackbox.plugin.zsh
+++ b/blackbox.plugin.zsh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 # The MIT License (MIT)
 
 # Copyright (c) 2014 Stack Exchange, Inc.
diff --git a/tools/profile.d-usrblackbox-test.sh b/tools/profile.d-usrblackbox-test.sh
index 991787d..9e5dfb4 100755
--- a/tools/profile.d-usrblackbox-test.sh
+++ b/tools/profile.d-usrblackbox-test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 # Test profile.d-usrblackbox.sh
 
diff --git a/tools/test_functions.sh b/tools/test_functions.sh
index fda223e..68786fa 100755
--- a/tools/test_functions.sh
+++ b/tools/test_functions.sh
@@ -47,7 +47,7 @@ function assert_file_missing() {
 function assert_file_exists() {
   if [[ ! -e "$1" ]]; then
     echo "ASSERT FAILED: ${1} should exist."
-    echo "PWD=$(/bin/pwd -P)"
+    echo "PWD=$(/usr/bin/env pwd -P)"
     #echo "LS START"
     #ls -la
     #echo "LS END"