diff --git a/usr.sbin/pw/tests/helper_functions.shin b/usr.sbin/pw/tests/helper_functions.shin
index f87b1e7d9436..3680dfe608eb 100755
--- a/usr.sbin/pw/tests/helper_functions.shin
+++ b/usr.sbin/pw/tests/helper_functions.shin
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
+# The pw command
+PW="pw -V ${HOME}"
+
 # Workdir to run tests in
 TESTDIR=$(atf_get_srcdir)
 
 # Populate the files pw needs to use into $HOME/etc
 populate_etc_skel() {
 	cp ${TESTDIR}/master.passwd ${HOME} || \
 		atf_fail "Populating master.passwd in ${HOME}"
 	cp ${TESTDIR}/group ${HOME} || atf_fail "Populating group in ${HOME}"
 
 	# Generate the passwd file
 	pwd_mkdb -p -d ${HOME} ${HOME}/master.passwd || \
 		atf_fail "generate passwd from master.passwd"
 }
diff --git a/usr.sbin/pw/tests/pw_delete.sh b/usr.sbin/pw/tests/pw_delete.sh
index 02a9adebe4fe..832ec932f644 100755
--- a/usr.sbin/pw/tests/pw_delete.sh
+++ b/usr.sbin/pw/tests/pw_delete.sh
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 # Import helper functions
 . $(atf_get_srcdir)/helper_functions.shin
 
 # Test that a user can be deleted when another user is part of this
 # user's default group and does not go into an infinate loop.
 # PR: 191427
 atf_test_case rmuser_seperate_group cleanup
 rmuser_seperate_group_head() {
 	atf_set "timeout" "30"
 }
 rmuser_seperate_group_body() {
 	populate_etc_skel
-	pw -V ${HOME} useradd test || atf_fail "Creating test user"
-	pw -V ${HOME} groupmod test -M 'test,root' || \
+	${PW} useradd test || atf_fail "Creating test user"
+	${PW} groupmod test -M 'test,root' || \
 		atf_fail "Modifying the group"
-	pw -V ${HOME} userdel test || atf_fail "Delete the test user"
+	${PW} userdel test || atf_fail "Delete the test user"
 }
 
 atf_test_case group_do_not_delete_wheel_if_group_unknown
 group_do_not_delete_wheel_if_group_unknown_head() {
 	atf_set "descr" "Make sure we do not consider gid 0 an unknown group"
 }
 
 group_do_not_delete_wheel_if_group_unknown_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel
-	atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x pw -V ${HOME} groupdel -g I_do_not_exist
-	atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel
+	atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x ${PW} groupshow wheel
+	atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x ${PW} groupdel -g I_do_not_exist
+	atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x ${PW} groupshow wheel
 }
 
 atf_test_case user_do_not_try_to_delete_root_if_user_unknown
 user_do_not_try_to_delete_root_if_user_unknown_head() {
 	atf_set "descr" "Make sure not to try to remove root if deleting an unknown user"
 }
 
 user_do_not_try_to_delete_root_if_user_unknown_body() {
 	populate_etc_skel
-	atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x pw -V ${HOME} userdel -u plop
+	atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x ${PW} userdel -u plop
 }
 
 atf_init_test_cases() {
 	atf_add_test_case rmuser_seperate_group
 	atf_add_test_case group_do_not_delete_wheel_if_group_unknown
 	atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown
 }
diff --git a/usr.sbin/pw/tests/pw_lock.sh b/usr.sbin/pw/tests/pw_lock.sh
index 070a6f914396..9f14e24ae078 100755
--- a/usr.sbin/pw/tests/pw_lock.sh
+++ b/usr.sbin/pw/tests/pw_lock.sh
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 # Import helper functions
 . $(atf_get_srcdir)/helper_functions.shin
 
 # Test locking and unlocking a user account
 atf_test_case user_locking cleanup
 user_locking_body() {
 	populate_etc_skel
-	pw -V ${HOME} useradd test || atf_fail "Creating test user"
-	pw -V ${HOME} lock test || atf_fail "Locking the user"
+	${PW} useradd test || atf_fail "Creating test user"
+	${PW} lock test || atf_fail "Locking the user"
 	atf_check -s exit:0 -o match:"^test:\*LOCKED\*\*:1001:" \
 		grep "^test:\*LOCKED\*\*:1001:" $HOME/master.passwd
-	pw -V ${HOME} unlock test || atf_fail "Locking the user"
+	${PW} unlock test || atf_fail "Locking the user"
 	atf_check -s exit:0 -o match:"^test:\*:1001:" \
 		grep "^test:\*:1001:" $HOME/master.passwd
 }
 
 
 atf_init_test_cases() {
 	atf_add_test_case user_locking
 }
diff --git a/usr.sbin/pw/tests/pw_modify.sh b/usr.sbin/pw/tests/pw_modify.sh
index b81f105d92be..ad7ad0a3b7cf 100755
--- a/usr.sbin/pw/tests/pw_modify.sh
+++ b/usr.sbin/pw/tests/pw_modify.sh
@@ -1,80 +1,80 @@
 # $FreeBSD$
 
 # Import helper functions
 . $(atf_get_srcdir)/helper_functions.shin
 
 
 # Test adding & removing a user from a group
 atf_test_case groupmod_user
 groupmod_user_body() {
 	populate_etc_skel
-	atf_check -s exit:0 pw -V ${HOME} addgroup test
-	atf_check -s exit:0 pw -V ${HOME} groupmod test -m root
+	atf_check -s exit:0 ${PW} addgroup test
+	atf_check -s exit:0 ${PW} groupmod test -m root
 	atf_check -s exit:0 -o match:"^test:\*:1001:root$" \
 		grep "^test:\*:.*:root$" $HOME/group
-	atf_check -s exit:0 pw -V ${HOME} groupmod test -d root
+	atf_check -s exit:0 ${PW} groupmod test -d root
 	atf_check -s exit:0 -o match:"^test:\*:1001:$" \
 		grep "^test:\*:.*:$" $HOME/group
 }
 
 
 # Test adding and removing a user that does not exist
 atf_test_case groupmod_invalid_user
 groupmod_invalid_user_body() {
 	populate_etc_skel
-	atf_check -s exit:0 pw -V ${HOME} addgroup test
-	atf_check -s exit:67 -e match:"does not exist" pw -V ${HOME} groupmod test -m foo
-	atf_check -s exit:0  pw -V ${HOME} groupmod test -d foo
+	atf_check -s exit:0 ${PW} addgroup test
+	atf_check -s exit:67 -e match:"does not exist" ${PW} groupmod test -m foo
+	atf_check -s exit:0  ${PW} groupmod test -d foo
 }
 
 atf_test_case groupmod_bug_193704
 groupmod_bug_193704_head() {
 	atf_set "descr" "Regression test for the #193704 bug"
 }
 groupmod_bug_193704_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd test
-	atf_check -s exit:0 -x pw -V ${HOME} groupmod test -l newgroupname
-	atf_check -s exit:65 -e match:"^pw: unknown group" -x pw -V ${HOME} groupshow test
+	atf_check -s exit:0 -x ${PW} groupadd test
+	atf_check -s exit:0 -x ${PW} groupmod test -l newgroupname
+	atf_check -s exit:65 -e match:"^pw: unknown group" -x ${PW} groupshow test
 }
 
 atf_test_case usermod_bug_185666
 usermod_bug_185666_head() {
 	atf_set "descr" "Regression test for the #185666 bug"
 }
 
 usermod_bug_185666_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -x pw -V ${HOME} useradd testuser
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup2
-	atf_check -s exit:0 -x pw -V ${HOME} usermod testuser -G testgroup
-	atf_check -o inline:"testuser:*:1001:\n" -x pw -V${HOME} groupshow testuser
-	atf_check -o inline:"testgroup:*:1002:testuser\n" -x pw -V ${HOME} groupshow testgroup
-	atf_check -o inline:"testgroup2:*:1003:\n" -x pw -V${HOME} groupshow testgroup2
-	atf_check -s exit:0 -x pw -V ${HOME} usermod testuser -G testgroup2
-	atf_check -o inline:"testuser:*:1001:\n" -x pw -V ${HOME} groupshow testuser
-	atf_check -o inline:"testgroup:*:1002:\n" -x pw -V ${HOME} groupshow testgroup
-	atf_check -o inline:"testgroup2:*:1003:testuser\n" -x pw -V ${HOME} groupshow testgroup2
+	atf_check -s exit:0 -x ${PW} useradd testuser
+	atf_check -s exit:0 -x ${PW} groupadd testgroup
+	atf_check -s exit:0 -x ${PW} groupadd testgroup2
+	atf_check -s exit:0 -x ${PW} usermod testuser -G testgroup
+	atf_check -o inline:"testuser:*:1001:\n" -x ${PW} groupshow testuser
+	atf_check -o inline:"testgroup:*:1002:testuser\n" -x ${PW} groupshow testgroup
+	atf_check -o inline:"testgroup2:*:1003:\n" -x ${PW} groupshow testgroup2
+	atf_check -s exit:0 -x ${PW} usermod testuser -G testgroup2
+	atf_check -o inline:"testuser:*:1001:\n" -x ${PW} groupshow testuser
+	atf_check -o inline:"testgroup:*:1002:\n" -x ${PW} groupshow testgroup
+	atf_check -o inline:"testgroup2:*:1003:testuser\n" -x ${PW} groupshow testgroup2
 }
 
 atf_test_case do_not_duplicate_group_on_gid_change
 do_not_duplicate_group_on_gid_change_head() {
 	atf_set "descr" "Do not duplicate group on gid change"
 }
 
 do_not_duplicate_group_on_gid_change_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup
-	atf_check -s exit:0 -x pw -V ${HOME} groupmod testgroup -g 12345
+	atf_check -s exit:0 -x ${PW} groupadd testgroup
+	atf_check -s exit:0 -x ${PW} groupmod testgroup -g 12345
 	# use grep to see if the entry has not be duplicated
 	atf_check -o inline:"testgroup:*:12345:\n" -s exit:0 -x grep "^testgroup" ${HOME}/group
 }
 
 atf_init_test_cases() {
 	atf_add_test_case groupmod_user
 	atf_add_test_case groupmod_invalid_user
 	atf_add_test_case groupmod_bug_193704
 	atf_add_test_case usermod_bug_185666
 	atf_add_test_case do_not_duplicate_group_on_gid_change
 }