diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile
index 6d077593056d..8c3cd36f8d0c 100644
--- a/usr.sbin/pw/tests/Makefile
+++ b/usr.sbin/pw/tests/Makefile
@@ -14,10 +14,12 @@ ATF_TESTS_SH=	pw_etcdir_test \
 		pw_groupadd_test \
 		pw_groupdel_test \
 		pw_groupmod_test \
+		pw_groupshow_test \
 		pw_useradd_test \
 		pw_userdel_test \
 		pw_usermod_test \
-		pw_usernext_test
+		pw_usernext_test \
+		pw_usershow_test
 
 .for tp in ${ATF_TESTS_SH}
 TEST_METADATA.${tp}+=	required_user="root"
diff --git a/usr.sbin/pw/tests/pw_groupshow_test.sh b/usr.sbin/pw/tests/pw_groupshow_test.sh
new file mode 100755
index 000000000000..f348d0ab1f70
--- /dev/null
+++ b/usr.sbin/pw/tests/pw_groupshow_test.sh
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+atf_test_case group_show_all
+group_show_all_body() {
+	populate_etc_skel
+	atf_check -o not-empty ${PW} groupshow -a
+}
+
+atf_test_case group_show_gid
+group_show_gid_body() {
+	populate_etc_skel
+	atf_check -o not-empty ${PW} groupshow -g 0
+}
+
+atf_test_case group_show_name
+group_show_name_body() {
+	populate_etc_skel
+	atf_check -o not-empty ${PW} groupshow wheel
+}
+
+atf_test_case group_show_nonexistent_gid
+group_show_nonexistent_gid_body() {
+	populate_etc_skel
+
+	nonexistent_gid=4242
+	no_such_name_msg="pw: unknown gid \`$nonexistent_gid'\n"
+
+	atf_check -e "inline:$no_such_name_msg" -s exit:65 ${PW} groupshow \
+		$nonexistent_gid
+	atf_check -e "inline:$no_such_name_msg" -s exit:65 ${PW} groupshow \
+		-g $nonexistent_gid
+}
+
+atf_test_case group_show_nonexistent_name
+group_show_nonexistent_name_body() {
+	populate_etc_skel
+
+	nonexistent_name=bogus
+	no_such_name_msg="pw: unknown group \`$nonexistent_name'\n"
+
+	atf_check -e "inline:$no_such_name_msg" -s exit:65 ${PW} groupshow \
+		$nonexistent_name
+	atf_check -e "inline:$no_such_name_msg" -s exit:65 ${PW} groupshow \
+		-n $nonexistent_name
+}
+
+atf_init_test_cases() {
+	atf_add_test_case group_show_all
+	atf_add_test_case group_show_gid
+	atf_add_test_case group_show_name
+	atf_add_test_case group_show_nonexistent_gid
+	atf_add_test_case group_show_nonexistent_name
+}
diff --git a/usr.sbin/pw/tests/pw_usershow_test.sh b/usr.sbin/pw/tests/pw_usershow_test.sh
new file mode 100755
index 000000000000..530597948e4a
--- /dev/null
+++ b/usr.sbin/pw/tests/pw_usershow_test.sh
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+atf_test_case user_show_all
+user_show_all_body() {
+	populate_etc_skel
+	atf_check -o not-empty ${PW} usershow -a
+}
+
+atf_test_case user_show_name
+user_show_name_body() {
+	populate_etc_skel
+	atf_check -o not-empty ${PW} usershow root
+}
+
+atf_test_case user_show_nonexistent_name
+user_show_nonexistent_name_body() {
+	populate_etc_skel
+
+	nonexistent_user=bogus
+	no_such_user_msg="pw: no such user \`$nonexistent_user'\n"
+
+	atf_check -e "inline:$no_such_user_msg" -s exit:67 ${PW} usershow \
+		$nonexistent_user
+	atf_check -e "inline:$no_such_user_msg" -s exit:67 ${PW} usershow \
+		-n $nonexistent_user
+}
+
+atf_test_case user_show_nonexistent_uid
+user_show_nonexistent_uid_body() {
+	populate_etc_skel
+
+	nonexistent_uid=4242
+	no_such_uid_msg="pw: no such uid \`$nonexistent_uid'\n"
+
+	atf_check -e "inline:$no_such_uid_msg" -s exit:67 ${PW} usershow \
+		$nonexistent_uid
+	atf_check -e "inline:$no_such_uid_msg" -s exit:67 ${PW} usershow \
+		-u $nonexistent_uid
+}
+
+atf_test_case user_show_uid
+user_show_uid_body() {
+	populate_etc_skel
+	atf_check -o not-empty ${PW} usershow -u 0
+}
+
+atf_init_test_cases() {
+	atf_add_test_case user_show_all
+	atf_add_test_case user_show_name
+	atf_add_test_case user_show_nonexistent_name
+	atf_add_test_case user_show_nonexistent_uid
+	atf_add_test_case user_show_uid
+}