diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index b2e561691fb7..bf6597cefd48 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170308: rename some tests
+OLD_FILES+=usr/tests/bin/pwait/pwait
+OLD_FILES+=usr/tests/usr.bin/timeout/timeout
 # 20170307: remove pcap-int.h
 OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0.
diff --git a/bin/pwait/tests/Makefile b/bin/pwait/tests/Makefile
index f7aea5552d45..db05b1f1051c 100644
--- a/bin/pwait/tests/Makefile
+++ b/bin/pwait/tests/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-ATF_TESTS_SH=	pwait
+ATF_TESTS_SH=	pwait_test
 
 .include <bsd.test.mk>
diff --git a/bin/pwait/tests/pwait.sh b/bin/pwait/tests/pwait_test.sh
similarity index 100%
rename from bin/pwait/tests/pwait.sh
rename to bin/pwait/tests/pwait_test.sh
diff --git a/usr.bin/timeout/tests/Makefile b/usr.bin/timeout/tests/Makefile
index bced1554f864..691a27df20b1 100644
--- a/usr.bin/timeout/tests/Makefile
+++ b/usr.bin/timeout/tests/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-ATF_TESTS_SH=	timeout
+ATF_TESTS_SH=	timeout_test
 
 .include <bsd.test.mk>
diff --git a/usr.bin/timeout/tests/timeout.sh b/usr.bin/timeout/tests/timeout_test.sh
similarity index 100%
rename from usr.bin/timeout/tests/timeout.sh
rename to usr.bin/timeout/tests/timeout_test.sh