Index: sbin/ping/tests/ping_test.sh
===================================================================
--- sbin/ping/tests/ping_test.sh
+++ sbin/ping/tests/ping_test.sh
@@ -35,9 +35,9 @@
     if ! getaddrinfo -f inet localhost 1>/dev/null 2>&1; then
 	atf_skip "IPv4 is not configured"
     fi
-    atf_check -s exit:0 -o save:std.out -e empty \
+    atf_check -s exit:0 -o save:ping_c1_s56_t1.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
+    check_ping_statistics ping_c1_s56_t1.std.out $(atf_get_srcdir)/ping_c1_s56_t1.out
 }
 
 atf_test_case ping_6_c1_s8_t1
@@ -48,9 +48,9 @@
     if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then
 	atf_skip "IPv6 is not configured"
     fi
-    atf_check -s exit:0 -o save:std.out -e empty \
+    atf_check -s exit:0 -o save:ping_6_c1_s8_t1.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
+    check_ping_statistics ping_6_c1_s8_t1.std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
 }
 
 atf_test_case ping6_c1_s8_t1
@@ -61,9 +61,9 @@
     if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then
 	atf_skip "IPv6 is not configured"
     fi
-    atf_check -s exit:0 -o save:std.out -e empty \
+    atf_check -s exit:0 -o save:ping6_c1_s8_t1.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
+    check_ping_statistics ping6_c1_s8_t1.std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
 }
 
 atf_init_test_cases() {