diff --git a/misc/make-deps.sh b/misc/make-deps.sh
index 2988d9b0..34e6d1ad 100755
--- a/misc/make-deps.sh
+++ b/misc/make-deps.sh
@@ -9,13 +9,13 @@ if env | grep -q '^TRAVIS=true$'; then
 	travis=1
 fi
 
-sudo_command=$(which sudo)
+sudo_command=$(command -v sudo)
 
-YUM=`which yum 2>/dev/null`
-DNF=`which dnf 2>/dev/null`
-APT=`which apt-get 2>/dev/null`
-BREW=`which brew 2>/dev/null`
-PACMAN=`which pacman 2>/dev/null`
+YUM=`command -v yum 2>/dev/null`
+DNF=`command -v dnf 2>/dev/null`
+APT=`command -v apt-get 2>/dev/null`
+BREW=`command -v brew 2>/dev/null`
+PACMAN=`command -v pacman 2>/dev/null`
 
 # if DNF is available use it
 if [ -x "$DNF" ]; then
@@ -81,5 +81,5 @@ fi
 go get golang.org/x/tools/cmd/stringer			# for automatic stringer-ing
 go get github.com/jteeuwen/go-bindata/go-bindata	# for compiling in non golang files
 go get github.com/golang/lint/golint			# for `golint`-ing
-go get -u gopkg.in/alecthomas/gometalinter.v1 && mv "$(dirname $(which gometalinter.v1))/gometalinter.v1" "$(dirname $(which gometalinter.v1))/gometalinter" && gometalinter --install	# bonus
+go get -u gopkg.in/alecthomas/gometalinter.v1 && mv "$(dirname $(command -v gometalinter.v1))/gometalinter.v1" "$(dirname $(command -v gometalinter.v1))/gometalinter" && gometalinter --install	# bonus
 cd "$XPWD" >/dev/null
diff --git a/tag.sh b/tag.sh
index 9bc36b09..e20e44ff 100755
--- a/tag.sh
+++ b/tag.sh
@@ -46,5 +46,5 @@ git push origin $t
 
 # Be informative.
 GIT_PAGER=cat git diff --stat "$v" "$t"
-if which contrib.sh &>/dev/null; then contrib.sh "$v"; fi
+if command -v contrib.sh &>/dev/null; then contrib.sh "$v"; fi
 echo -e "run 'git log $v..$t' to see what has changed since $v"
diff --git a/test/test-yamlfmt.sh b/test/test-yamlfmt.sh
index e13d4b43..b23b7b70 100755
--- a/test/test-yamlfmt.sh
+++ b/test/test-yamlfmt.sh
@@ -17,7 +17,7 @@ set -o pipefail
 
 ROOT=$(dirname "${BASH_SOURCE}")/..
 
-RUBY=`which ruby 2>/dev/null`
+RUBY=`command -v ruby 2>/dev/null`
 if [ -z $RUBY ]; then
 	fail_test "The 'ruby' utility can't be found."
 fi