Index: sbin/ping/tests/ping_test.sh
===================================================================
--- sbin/ping/tests/ping_test.sh
+++ sbin/ping/tests/ping_test.sh
@@ -44,10 +44,10 @@
 ping_c1_s56_t1_head()
 {
 	atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet"
+	require_ipv4
 }
 ping_c1_s56_t1_body()
 {
-	require_ipv4
 	atf_check -s exit:0 -o save:std.out -e empty \
 	    ping -4 -c 1 -s 56 -t 1 localhost
 	check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1.out
@@ -57,11 +57,11 @@
 ping_c1_s56_t1_S127_head()
 {
 	atf_set "descr" "Check that ping -S 127.0.0.1 localhost succeeds"
+	require_ipv4
+	require_ipv6
 }
 ping_c1_s56_t1_S127_body()
 {
-	require_ipv4
-	require_ipv6
 	atf_check -s exit:0 -o save:std.out -e empty \
 	    ping -c 1 -s 56 -t 1 -S 127.0.0.1 localhost
 	check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1_S127.out
@@ -71,10 +71,10 @@
 ping_6_c1_s8_t1_head()
 {
 	atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet"
+	require_ipv6
 }
 ping_6_c1_s8_t1_body()
 {
-	require_ipv6
 	atf_check -s exit:0 -o save:std.out -e empty \
 	    ping -6 -c 1 -s 8 -t 1 localhost
 	check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
@@ -84,11 +84,11 @@
 ping_c1_s8_t1_S1_head()
 {
 	atf_set "descr" "Check that ping -S ::1 localhost succeeds"
+	require_ipv4
+	require_ipv6
 }
 ping_c1_s8_t1_S1_body()
 {
-	require_ipv4
-	require_ipv6
 	atf_check -s exit:0 -o save:std.out -e empty \
 	    ping -c 1 -s 8 -t 1 -S ::1 localhost
 	check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s8_t1_S1.out
@@ -98,10 +98,10 @@
 ping6_c1_s8_t1_head()
 {
 	atf_set "descr" "Use IPv6 when invoked as ping6"
+	require_ipv6
 }
 ping6_c1_s8_t1_body()
 {
-	require_ipv6
 	atf_check -s exit:0 -o save:std.out -e empty \
 	    ping6 -c 1 -s 8 -t 1 localhost
 	check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
@@ -110,20 +110,20 @@
 ping_c1t6_head()
 {
 	atf_set "descr" "-t6 is not interpreted as -t -6 by ping"
+	require_ipv4
 }
 ping_c1t6_body()
 {
-	require_ipv4
 	atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1
 }
 
 ping6_c1t4_head()
 {
 	atf_set "descr" "-t4 is not interpreted as -t -4 by ping6"
+	require_ipv6
 }
 ping6_c1t4_body()
 {
-	require_ipv6
 	atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1
 }