68 files changed, 246 insertions, 153 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index da64e3473ccc..6bfbb9d8c744 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -95,6 +95,16 @@
                 atf-sh
                 ..
             ..
+            lastcomm
+            ..
+        ..
+        usr.sbin
+            etcupdate
+            ..
+            newsyslog
+            ..
+            sa
+            ..
         ..
     ..
 ..
diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
index 7538f23a7508..2365e3ab8929 100644
--- a/tools/regression/usr.bin/Makefile
+++ b/tools/regression/usr.bin/Makefile
@@ -2,8 +2,5 @@
 
 SUBDIR=	apply calendar comm file2c join jot m4 ncal printf sed tr	\
 	uudecode uuencode xargs
-.if !defined(AUTOMATED)
-SUBDIR+= lastcomm
-.endif
 
 .include <bsd.subdir.mk>
diff --git a/tools/regression/usr.bin/lastcomm/Makefile b/tools/regression/usr.bin/lastcomm/Makefile
deleted file mode 100644
index 930f3ff5fd29..000000000000
--- a/tools/regression/usr.bin/lastcomm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-all: regress
-
-regress: regress.t
-	./regress.t
diff --git a/tools/regression/usr.bin/lastcomm/regress.t b/tools/regression/usr.bin/lastcomm/regress.t
deleted file mode 100755
index d733dbcdb454..000000000000
--- a/tools/regression/usr.bin/lastcomm/regress.t
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-DIR=`dirname $0`
-ARCH=`uname -m`
-
-TZ=UTC; export TZ
-
-check()
-{
-	NUM=$1
-	shift
-	# Remove tty field, which varies between systems.
-	awk '{$4 = ""; print}' |
-	if diff -q - $DIR/$1
-	then
-		echo "ok $NUM"
-	else
-		echo "not ok $NUM"
-	fi
-}
-
-
-cat $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in >$DIR/v1v2-$ARCH-acct.in
-cat $DIR/v2-$ARCH.out $DIR/v1-$ARCH.out >$DIR/v1v2-$ARCH.out
-
-echo 1..6
-
-lastcomm -cesuS -f $DIR/v1-$ARCH-acct.in | check 1 v1-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v1-$ARCH-acct.in | tail -r | check 2 v1-$ARCH.out
-lastcomm -cesuS -f $DIR/v2-$ARCH-acct.in | check 3 v2-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v2-$ARCH-acct.in | tail -r | check 4 v2-$ARCH.out
-lastcomm -cesuS -f $DIR/v1v2-$ARCH-acct.in | check 5 v1v2-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v1v2-$ARCH-acct.in | tail -r | check 6 v1v2-$ARCH.out
-
-rm $DIR/v1v2-$ARCH-acct.in
-rm $DIR/v1v2-$ARCH.out
-
-exit 0
diff --git a/tools/regression/usr.sbin/Makefile b/tools/regression/usr.sbin/Makefile
deleted file mode 100644
index 071100b226b2..000000000000
--- a/tools/regression/usr.sbin/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	newsyslog sa
-
-.include <bsd.subdir.mk>
diff --git a/tools/regression/usr.sbin/newsyslog/Makefile b/tools/regression/usr.sbin/newsyslog/Makefile
deleted file mode 100644
index 2c9ca5943505..000000000000
--- a/tools/regression/usr.sbin/newsyslog/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-all:
-	sh regress.sh
diff --git a/tools/regression/usr.sbin/newsyslog/regress.t b/tools/regression/usr.sbin/newsyslog/regress.t
deleted file mode 100755
index c36d8342d32a..000000000000
--- a/tools/regression/usr.sbin/newsyslog/regress.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-sh regress.sh
diff --git a/tools/regression/usr.sbin/sa/Makefile b/tools/regression/usr.sbin/sa/Makefile
deleted file mode 100644
index 930f3ff5fd29..000000000000
--- a/tools/regression/usr.sbin/sa/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-all: regress
-
-regress: regress.t
-	./regress.t
diff --git a/tools/regression/usr.sbin/sa/regress.t b/tools/regression/usr.sbin/sa/regress.t
deleted file mode 100755
index d28536adddd2..000000000000
--- a/tools/regression/usr.sbin/sa/regress.t
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-DIR=`dirname $0`
-LCDIR=`dirname $0`/../../usr.bin/lastcomm
-ARCH=`uname -m`
-
-collapse_whitespace()
-{
-	sed -E 's,[ 	]+, ,g'
-}
-
-check()
-{
-	NUM=$1
-	shift
-	collapse_whitespace | \
-	if diff -q - $1
-	then
-		echo "ok $NUM"
-	else
-		echo "not ok $NUM"
-	fi
-}
-
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-cp $LCDIR/v2-$ARCH-acct.in $DIR/v2-$ARCH-acct.in
-
-echo 1..13
-
-# Command listings of the two acct versions
-sa -u $DIR/v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH-u.out
-sa -u $DIR/v2-$ARCH-acct.in | check 2 $DIR/v2-$ARCH-u.out
-
-# Plain summaries of user/process
-sa -i $DIR/v1-$ARCH-acct.in | check 3 $DIR/v1-$ARCH-sav.out
-sa -im $DIR/v1-$ARCH-acct.in | check 4 $DIR/v1-$ARCH-usr.out
-
-# Backward compatibility of v1 summary files
-sa -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
-	check 5 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
-	check 6 $DIR/v1-$ARCH-usr.out
-
-# Convert old summary format to new 
-cp $DIR/v1-$ARCH-sav.in $DIR/v2c-$ARCH-sav.in
-cp $DIR/v1-$ARCH-usr.in $DIR/v2c-$ARCH-usr.in
-sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null >/dev/null
-sa -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 7 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 8 $DIR/v1-$ARCH-usr.out
-
-# Reading v2 summary files
-sa -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
-	check 9 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
-	check 10 $DIR/v1-$ARCH-usr.out
-
-# Summarize
-sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null
-sa -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 11 $DIR/v1-$ARCH-sav.out
-sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
-	check 12 $DIR/v1-$ARCH-usr.out
-
-# Accumulate
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in \
-    | collapse_whitespace >$DIR/double
-cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -i $DIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in | check 13 $DIR/double
-
-# Clean up
-rm $DIR/double $DIR/v2c-$ARCH-usr.in $DIR/v2c-$ARCH-sav.in $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in
-
-exit 0
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index 84708d9fb413..88253757b7f1 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,7 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile
new file mode 100644
index 000000000000..b0fac0e4aa16
--- /dev/null
+++ b/usr.bin/lastcomm/tests/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/lastcomm
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		v1-amd64-acct.in
+FILES+=		v1-amd64.out
+FILES+=		v1-i386-acct.in
+FILES+=		v1-i386.out
+FILES+=		v1-sparc64-acct.in
+FILES+=		v1-sparc64.out
+FILES+=		v2-amd64-acct.in
+FILES+=		v2-amd64.out
+FILES+=		v2-i386-acct.in
+FILES+=		v2-i386.out
+FILES+=		v2-sparc64-acct.in
+FILES+=		v2-sparc64.out
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.bin/lastcomm/README b/usr.bin/lastcomm/tests/README
index 62e0281dbf88..62e0281dbf88 100644
--- a/tools/regression/usr.bin/lastcomm/README
+++ b/usr.bin/lastcomm/tests/README
diff --git a/usr.bin/lastcomm/tests/legacy_test.sh b/usr.bin/lastcomm/tests/legacy_test.sh
new file mode 100644
index 000000000000..35ef78bf8484
--- /dev/null
+++ b/usr.bin/lastcomm/tests/legacy_test.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+DIR=`dirname $0`
+ARCH=`uname -m`
+
+TZ=UTC; export TZ
+
+check()
+{
+	NUM=$1
+	shift
+	# Remove tty field, which varies between systems.
+	awk '{$4 = ""; print}' |
+	if diff -q - $1
+	then
+		echo "ok $NUM"
+	else
+		echo "not ok $NUM"
+	fi
+}
+
+
+cat $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in >v1v2-$ARCH-acct.in
+cat $DIR/v2-$ARCH.out $DIR/v1-$ARCH.out >v1v2-$ARCH.out
+
+echo 1..6
+
+lastcomm -cesuS -f $DIR/v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH.out
+lastcomm -cesuS -f - <$DIR/v1-$ARCH-acct.in | tail -r | check 2 $DIR/v1-$ARCH.out
+lastcomm -cesuS -f $DIR/v2-$ARCH-acct.in | check 3 $DIR/v2-$ARCH.out
+lastcomm -cesuS -f - <$DIR/v2-$ARCH-acct.in | tail -r | check 4 $DIR/v2-$ARCH.out
+lastcomm -cesuS -f v1v2-$ARCH-acct.in | check 5 v1v2-$ARCH.out
+lastcomm -cesuS -f - <v1v2-$ARCH-acct.in | tail -r | check 6 v1v2-$ARCH.out
+
+exit 0
diff --git a/tools/regression/usr.bin/lastcomm/v1-amd64-acct.in b/usr.bin/lastcomm/tests/v1-amd64-acct.in
index 50546a3f1b86..50546a3f1b86 100644
--- a/tools/regression/usr.bin/lastcomm/v1-amd64-acct.in
+++ b/usr.bin/lastcomm/tests/v1-amd64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v1-amd64.out b/usr.bin/lastcomm/tests/v1-amd64.out
index bacbd57cdecf..bacbd57cdecf 100644
--- a/tools/regression/usr.bin/lastcomm/v1-amd64.out
+++ b/usr.bin/lastcomm/tests/v1-amd64.out
diff --git a/tools/regression/usr.bin/lastcomm/v1-i386-acct.in b/usr.bin/lastcomm/tests/v1-i386-acct.in
index f427c0ece3d7..f427c0ece3d7 100644
--- a/tools/regression/usr.bin/lastcomm/v1-i386-acct.in
+++ b/usr.bin/lastcomm/tests/v1-i386-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v1-i386.out b/usr.bin/lastcomm/tests/v1-i386.out
index 86ec9e22c708..86ec9e22c708 100644
--- a/tools/regression/usr.bin/lastcomm/v1-i386.out
+++ b/usr.bin/lastcomm/tests/v1-i386.out
diff --git a/tools/regression/usr.bin/lastcomm/v1-sparc64-acct.in b/usr.bin/lastcomm/tests/v1-sparc64-acct.in
index 00f05b423fc5..00f05b423fc5 100644
--- a/tools/regression/usr.bin/lastcomm/v1-sparc64-acct.in
+++ b/usr.bin/lastcomm/tests/v1-sparc64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v1-sparc64.out b/usr.bin/lastcomm/tests/v1-sparc64.out
index d33ae719fb53..d33ae719fb53 100644
--- a/tools/regression/usr.bin/lastcomm/v1-sparc64.out
+++ b/usr.bin/lastcomm/tests/v1-sparc64.out
diff --git a/tools/regression/usr.bin/lastcomm/v2-amd64-acct.in b/usr.bin/lastcomm/tests/v2-amd64-acct.in
index ca7bcaa66f78..ca7bcaa66f78 100644
--- a/tools/regression/usr.bin/lastcomm/v2-amd64-acct.in
+++ b/usr.bin/lastcomm/tests/v2-amd64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v2-amd64.out b/usr.bin/lastcomm/tests/v2-amd64.out
index 3942b04ad3c7..3942b04ad3c7 100644
--- a/tools/regression/usr.bin/lastcomm/v2-amd64.out
+++ b/usr.bin/lastcomm/tests/v2-amd64.out
diff --git a/tools/regression/usr.bin/lastcomm/v2-i386-acct.in b/usr.bin/lastcomm/tests/v2-i386-acct.in
index 4cdd97330947..4cdd97330947 100644
--- a/tools/regression/usr.bin/lastcomm/v2-i386-acct.in
+++ b/usr.bin/lastcomm/tests/v2-i386-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v2-i386.out b/usr.bin/lastcomm/tests/v2-i386.out
index 61bc811a7d74..61bc811a7d74 100644
--- a/tools/regression/usr.bin/lastcomm/v2-i386.out
+++ b/usr.bin/lastcomm/tests/v2-i386.out
diff --git a/tools/regression/usr.bin/lastcomm/v2-sparc64-acct.in b/usr.bin/lastcomm/tests/v2-sparc64-acct.in
index 26df19e8b5e6..26df19e8b5e6 100644
--- a/tools/regression/usr.bin/lastcomm/v2-sparc64-acct.in
+++ b/usr.bin/lastcomm/tests/v2-sparc64-acct.in
diff --git a/tools/regression/usr.bin/lastcomm/v2-sparc64.out b/usr.bin/lastcomm/tests/v2-sparc64.out
index f693e8efd9ff..f693e8efd9ff 100644
--- a/tools/regression/usr.bin/lastcomm/v2-sparc64.out
+++ b/usr.bin/lastcomm/tests/v2-sparc64.out
diff --git a/tools/regression/usr.bin/lastcomm/values.sh b/usr.bin/lastcomm/tests/values.sh
index 6c2095437e54..ab27f62f71d0 100644..100755
--- a/tools/regression/usr.bin/lastcomm/values.sh
+++ b/usr.bin/lastcomm/tests/values.sh
@@ -6,6 +6,7 @@
 ACCT=acct
 RESULTS=acct.`uname -m`.tar.gz
 TMPDIR=$$.tmp
+TZ=UTC; export TZ
 
 run()
 {
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 61d91b91113f..b709be552428 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -284,6 +284,10 @@ SUBDIR+=	praliases
 SUBDIR+=	sendmail
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	config
 SUBDIR+=	crunch
diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile
index 9f6d17ef2300..765533a331ad 100644
--- a/usr.sbin/etcupdate/Makefile
+++ b/usr.sbin/etcupdate/Makefile
@@ -1,6 +1,12 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SCRIPTS=etcupdate.sh
 MAN=	etcupdate.8
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile
new file mode 100644
index 000000000000..da83397e61ff
--- /dev/null
+++ b/usr.sbin/etcupdate/tests/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/etcupdate
+
+PLAIN_TESTS_SH=
+.for test in	always_test \
+		conflicts_test \
+		fbsdid_test \
+		ignore_test \
+		preworld_test \
+		tests_test \
+		tzsetup_test
+PLAIN_TESTS_SH+=	${test}
+TEST_METADATA.${test}+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.sbin/etcupdate/always.sh b/usr.sbin/etcupdate/tests/always_test.sh
index 514481e85b0f..514481e85b0f 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/always.sh
+++ b/usr.sbin/etcupdate/tests/always_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/conflicts.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh
index 816c18021d27..816c18021d27 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/conflicts.sh
+++ b/usr.sbin/etcupdate/tests/conflicts_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/fbsdid.sh b/usr.sbin/etcupdate/tests/fbsdid_test.sh
index c062c0680bb6..c062c0680bb6 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/fbsdid.sh
+++ b/usr.sbin/etcupdate/tests/fbsdid_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/ignore.sh b/usr.sbin/etcupdate/tests/ignore_test.sh
index 2d3d2f5f7687..2d3d2f5f7687 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/ignore.sh
+++ b/usr.sbin/etcupdate/tests/ignore_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/preworld.sh b/usr.sbin/etcupdate/tests/preworld_test.sh
index c73129339ca9..c73129339ca9 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/preworld.sh
+++ b/usr.sbin/etcupdate/tests/preworld_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/tests.sh b/usr.sbin/etcupdate/tests/tests_test.sh
index b99bbefbc81f..b99bbefbc81f 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/tests.sh
+++ b/usr.sbin/etcupdate/tests/tests_test.sh
diff --git a/tools/regression/usr.sbin/etcupdate/tzsetup.sh b/usr.sbin/etcupdate/tests/tzsetup_test.sh
index b10293890c7c..b10293890c7c 100755..100644
--- a/tools/regression/usr.sbin/etcupdate/tzsetup.sh
+++ b/usr.sbin/etcupdate/tests/tzsetup_test.sh
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index ebc297b4cf2a..4e3ae557034e 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
 SRCS=	newsyslog.c ptimes.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile
new file mode 100644
index 000000000000..f8ad2739cd78
--- /dev/null
+++ b/usr.sbin/newsyslog/tests/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/newsyslog
+
+TAP_TESTS_SH=	legacy_test
+
+.include <bsd.test.mk>
diff --git a/tools/regression/usr.sbin/newsyslog/regress.sh b/usr.sbin/newsyslog/tests/legacy_test.sh
index 70c424016c9a..ba10f2c56110 100755..100644
--- a/tools/regression/usr.sbin/newsyslog/regress.sh
+++ b/usr.sbin/newsyslog/tests/legacy_test.sh
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 COUNT=0
-TMPDIR=`mktemp -d -t regress_newsyslog`
+TMPDIR=$(pwd)/work
 if [ $? -ne 0 ]; then
         echo "$0: Can't create temp dir, exiting..."
         exit 1
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 0adf1f85e1fb..23f9bf274a85 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../../usr.bin/lastcomm
 
 PROG=	sa
 MAN=	sa.8
 SRCS=	main.c db.c pdb.c usrdb.c readrec.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
new file mode 100644
index 000000000000..204b51094515
--- /dev/null
+++ b/usr.sbin/sa/tests/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/sa
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		v1-amd64-sav.in
+FILES+=		v1-amd64-sav.out
+FILES+=		v1-amd64-u.out
+FILES+=		v1-amd64-usr.in
+FILES+=		v1-amd64-usr.out
+FILES+=		v1-i386-sav.in
+FILES+=		v1-i386-sav.out
+FILES+=		v1-i386-u.out
+FILES+=		v1-i386-usr.in
+FILES+=		v1-i386-usr.out
+FILES+=		v1-sparc64-sav.in
+FILES+=		v1-sparc64-sav.out
+FILES+=		v1-sparc64-u.out
+FILES+=		v1-sparc64-usr.in
+FILES+=		v1-sparc64-usr.out
+FILES+=		v2-amd64-sav.in
+FILES+=		v2-amd64-u.out
+FILES+=		v2-amd64-usr.in
+FILES+=		v2-i386-sav.in
+FILES+=		v2-i386-u.out
+FILES+=		v2-i386-usr.in
+FILES+=		v2-sparc64-sav.in
+FILES+=		v2-sparc64-u.out
+FILES+=		v2-sparc64-usr.in
+
+.include <bsd.test.mk>
diff --git a/usr.sbin/sa/tests/legacy_test.sh b/usr.sbin/sa/tests/legacy_test.sh
new file mode 100644
index 000000000000..d0d8f429366a
--- /dev/null
+++ b/usr.sbin/sa/tests/legacy_test.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+DIR=`dirname $0`
+LCDIR=`dirname $0`/../../usr.bin/lastcomm
+ARCH=`uname -m`
+
+collapse_whitespace()
+{
+	sed -E 's,[ 	]+, ,g'
+}
+
+check()
+{
+	NUM=$1
+	shift
+	collapse_whitespace | \
+	if diff -q - $1
+	then
+		echo "ok $NUM"
+	else
+		echo "not ok $NUM"
+	fi
+}
+
+install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+install -c -m 644 $LCDIR/v2-$ARCH-acct.in v2-$ARCH-acct.in
+
+echo 1..13
+
+# Command listings of the two acct versions
+sa -u v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH-u.out
+sa -u v2-$ARCH-acct.in | check 2 $DIR/v2-$ARCH-u.out
+
+# Plain summaries of user/process
+sa -i v1-$ARCH-acct.in | check 3 $DIR/v1-$ARCH-sav.out
+sa -im v1-$ARCH-acct.in | check 4 $DIR/v1-$ARCH-usr.out
+
+# Backward compatibility of v1 summary files
+sa -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
+	check 5 $DIR/v1-$ARCH-sav.out
+sa -m -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null |
+	check 6 $DIR/v1-$ARCH-usr.out
+
+# Convert old summary format to new 
+install -c -m 644 $DIR/v1-$ARCH-sav.in v2c-$ARCH-sav.in
+install -c -m 644 $DIR/v1-$ARCH-usr.in v2c-$ARCH-usr.in
+sa -s -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null >/dev/null
+sa -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 7 $DIR/v1-$ARCH-sav.out
+sa -m -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 8 $DIR/v1-$ARCH-usr.out
+
+# Reading v2 summary files
+sa -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
+	check 9 $DIR/v1-$ARCH-sav.out
+sa -m -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null |
+	check 10 $DIR/v1-$ARCH-usr.out
+
+# Summarize
+sa -is -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in >/dev/null
+sa -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 11 $DIR/v1-$ARCH-sav.out
+sa -m -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null |
+	check 12 $DIR/v1-$ARCH-usr.out
+
+# Accumulate
+install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+sa -is -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in >/dev/null
+install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+sa -s -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in \
+    | collapse_whitespace >double
+cp $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in
+sa -i v1-$ARCH-acct.in v1-$ARCH-acct.in | check 13 double
+
+exit 0
diff --git a/tools/regression/usr.sbin/sa/prime.sh b/usr.sbin/sa/tests/prime.sh
index c3fec3275a41..6992f45bce28 100644..100755
--- a/tools/regression/usr.sbin/sa/prime.sh
+++ b/usr.sbin/sa/tests/prime.sh
@@ -6,6 +6,8 @@
 # $FreeBSD$
 #
 
+TZ=UTC; export TZ
+
 # Set this to the path of the current sa command
 SANEW=/usr/sbin/sa
 
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.in b/usr.sbin/sa/tests/v1-amd64-sav.in
index adc38dde991d..adc38dde991d 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-sav.in
+++ b/usr.sbin/sa/tests/v1-amd64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.out b/usr.sbin/sa/tests/v1-amd64-sav.out
index a2289ee386e0..a2289ee386e0 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-sav.out
+++ b/usr.sbin/sa/tests/v1-amd64-sav.out
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-u.out b/usr.sbin/sa/tests/v1-amd64-u.out
index 4c13b7695a6d..4c13b7695a6d 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-u.out
+++ b/usr.sbin/sa/tests/v1-amd64-u.out
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.in b/usr.sbin/sa/tests/v1-amd64-usr.in
index 6896d323b5dc..6896d323b5dc 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-usr.in
+++ b/usr.sbin/sa/tests/v1-amd64-usr.in
diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.out b/usr.sbin/sa/tests/v1-amd64-usr.out
index 2282808c39de..2282808c39de 100644
--- a/tools/regression/usr.sbin/sa/v1-amd64-usr.out
+++ b/usr.sbin/sa/tests/v1-amd64-usr.out
diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.in b/usr.sbin/sa/tests/v1-i386-sav.in
index 4ed7aef8c36d..4ed7aef8c36d 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-sav.in
+++ b/usr.sbin/sa/tests/v1-i386-sav.in
diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.out b/usr.sbin/sa/tests/v1-i386-sav.out
index a8d68b17a0fc..a8d68b17a0fc 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-sav.out
+++ b/usr.sbin/sa/tests/v1-i386-sav.out
diff --git a/tools/regression/usr.sbin/sa/v1-i386-u.out b/usr.sbin/sa/tests/v1-i386-u.out
index 17c28bec45fd..17c28bec45fd 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-u.out
+++ b/usr.sbin/sa/tests/v1-i386-u.out
diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.in b/usr.sbin/sa/tests/v1-i386-usr.in
index 791b6ed232ae..791b6ed232ae 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-usr.in
+++ b/usr.sbin/sa/tests/v1-i386-usr.in
diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.out b/usr.sbin/sa/tests/v1-i386-usr.out
index cf9e7bdd02e1..cf9e7bdd02e1 100644
--- a/tools/regression/usr.sbin/sa/v1-i386-usr.out
+++ b/usr.sbin/sa/tests/v1-i386-usr.out
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.in b/usr.sbin/sa/tests/v1-sparc64-sav.in
index d6911cf946bd..d6911cf946bd 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-sav.in
+++ b/usr.sbin/sa/tests/v1-sparc64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out b/usr.sbin/sa/tests/v1-sparc64-sav.out
index 1905420793e4..1905420793e4 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out
+++ b/usr.sbin/sa/tests/v1-sparc64-sav.out
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-u.out b/usr.sbin/sa/tests/v1-sparc64-u.out
index d0ecb51b9de7..d0ecb51b9de7 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-u.out
+++ b/usr.sbin/sa/tests/v1-sparc64-u.out
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.in b/usr.sbin/sa/tests/v1-sparc64-usr.in
index 08d795b90dd4..08d795b90dd4 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-usr.in
+++ b/usr.sbin/sa/tests/v1-sparc64-usr.in
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out b/usr.sbin/sa/tests/v1-sparc64-usr.out
index cab001f1b531..cab001f1b531 100644
--- a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out
+++ b/usr.sbin/sa/tests/v1-sparc64-usr.out
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-sav.in b/usr.sbin/sa/tests/v2-amd64-sav.in
index 24f863b6151b..24f863b6151b 100644
--- a/tools/regression/usr.sbin/sa/v2-amd64-sav.in
+++ b/usr.sbin/sa/tests/v2-amd64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-u.out b/usr.sbin/sa/tests/v2-amd64-u.out
index 4196f4adffa2..4196f4adffa2 100644
--- a/tools/regression/usr.sbin/sa/v2-amd64-u.out
+++ b/usr.sbin/sa/tests/v2-amd64-u.out
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-usr.in b/usr.sbin/sa/tests/v2-amd64-usr.in
index 4c3b136b4a61..4c3b136b4a61 100644
--- a/tools/regression/usr.sbin/sa/v2-amd64-usr.in
+++ b/usr.sbin/sa/tests/v2-amd64-usr.in
diff --git a/tools/regression/usr.sbin/sa/v2-i386-sav.in b/usr.sbin/sa/tests/v2-i386-sav.in
index d3172dbb296a..d3172dbb296a 100644
--- a/tools/regression/usr.sbin/sa/v2-i386-sav.in
+++ b/usr.sbin/sa/tests/v2-i386-sav.in
diff --git a/tools/regression/usr.sbin/sa/v2-i386-u.out b/usr.sbin/sa/tests/v2-i386-u.out
index b553eb8ca96e..b553eb8ca96e 100644
--- a/tools/regression/usr.sbin/sa/v2-i386-u.out
+++ b/usr.sbin/sa/tests/v2-i386-u.out
diff --git a/tools/regression/usr.sbin/sa/v2-i386-usr.in b/usr.sbin/sa/tests/v2-i386-usr.in
index 465fdb4d0adf..465fdb4d0adf 100644
--- a/tools/regression/usr.sbin/sa/v2-i386-usr.in
+++ b/usr.sbin/sa/tests/v2-i386-usr.in
diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-sav.in b/usr.sbin/sa/tests/v2-sparc64-sav.in
index b6d836a59e06..b6d836a59e06 100644
--- a/tools/regression/usr.sbin/sa/v2-sparc64-sav.in
+++ b/usr.sbin/sa/tests/v2-sparc64-sav.in
diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-u.out b/usr.sbin/sa/tests/v2-sparc64-u.out
index 9339238ef449..9339238ef449 100644
--- a/tools/regression/usr.sbin/sa/v2-sparc64-u.out
+++ b/usr.sbin/sa/tests/v2-sparc64-u.out
diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-usr.in b/usr.sbin/sa/tests/v2-sparc64-usr.in
index 01a1bdc04333..01a1bdc04333 100644
--- a/tools/regression/usr.sbin/sa/v2-sparc64-usr.in
+++ b/usr.sbin/sa/tests/v2-sparc64-usr.in
diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile
new file mode 100644
index 000000000000..a7e9c7140f70
--- /dev/null
+++ b/usr.sbin/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.sbin
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>