Index: head/tests/sys/cddl/zfs/tests/exec/Makefile
===================================================================
--- head/tests/sys/cddl/zfs/tests/exec/Makefile	(revision 333494)
+++ head/tests/sys/cddl/zfs/tests/exec/Makefile	(revision 333495)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=tests
-TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/exec/
+TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/exec
 FILESDIR=${TESTSDIR}
 BINDIR=${TESTSDIR}
 
 ATF_TESTS_KSH93+=	exec_test
 TEST_METADATA+=		required_user="root"
 TEST_METADATA+=		is_exclusive=true
 
 ${PACKAGE}FILES+=	exec_001_pos.ksh
 ${PACKAGE}FILES+=	setup.ksh
 ${PACKAGE}FILES+=	cleanup.ksh
 ${PACKAGE}FILES+=	exec_002_neg.ksh
 PROG=	mmap_exec
 MAN=
 
 .include <bsd.test.mk>
Index: head/tests/sys/cddl/zfs/tests/history/Makefile
===================================================================
--- head/tests/sys/cddl/zfs/tests/history/Makefile	(revision 333494)
+++ head/tests/sys/cddl/zfs/tests/history/Makefile	(revision 333495)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=tests
-TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/history/
+TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/history
 FILESDIR=${TESTSDIR}
 
 ATF_TESTS_KSH93+=	history_test
 TEST_METADATA+=		required_user="root"
 TEST_METADATA+=		is_exclusive=true
 
 ${PACKAGE}FILES+=	history_005_neg.ksh
 ${PACKAGE}FILES+=	history_004_pos.ksh
 ${PACKAGE}FILES+=	history_008_pos.ksh
 ${PACKAGE}FILES+=	i386.orig_history.txt
 ${PACKAGE}FILES+=	sparc.orig_history.txt
 ${PACKAGE}FILES+=	history_common.kshlib
 ${PACKAGE}FILES+=	history.cfg
 ${PACKAGE}FILES+=	sparc.migratedpool.DAT.Z
 ${PACKAGE}FILES+=	history_010_pos.ksh
 ${PACKAGE}FILES+=	setup.ksh
 ${PACKAGE}FILES+=	zfs-pool-v4.dat.Z
 ${PACKAGE}FILES+=	history_009_pos.ksh
 ${PACKAGE}FILES+=	history_001_pos.ksh
 ${PACKAGE}FILES+=	history_006_neg.ksh
 ${PACKAGE}FILES+=	i386.migratedpool.DAT.Z
 ${PACKAGE}FILES+=	history_003_pos.ksh
 ${PACKAGE}FILES+=	history_007_pos.ksh
 ${PACKAGE}FILES+=	history_002_pos.ksh
 ${PACKAGE}FILES+=	cleanup.ksh
 
 .include <bsd.test.mk>
Index: head/tests/sys/cddl/zfs/tests/link_count/Makefile
===================================================================
--- head/tests/sys/cddl/zfs/tests/link_count/Makefile	(revision 333494)
+++ head/tests/sys/cddl/zfs/tests/link_count/Makefile	(revision 333495)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=tests
-TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/link_count/
+TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/link_count
 FILESDIR=${TESTSDIR}
 
 ATF_TESTS_KSH93+=	link_count_test
 TEST_METADATA+=		required_user="root"
 TEST_METADATA+=		is_exclusive=true
 
 ${PACKAGE}FILES+=	link_count_001.ksh
 ${PACKAGE}FILES+=	cleanup.ksh
 ${PACKAGE}FILES+=	link_count.cfg
 ${PACKAGE}FILES+=	setup.ksh
 
 .include <bsd.test.mk>
Index: head/tests/sys/cddl/zfs/tests/migration/Makefile
===================================================================
--- head/tests/sys/cddl/zfs/tests/migration/Makefile	(revision 333494)
+++ head/tests/sys/cddl/zfs/tests/migration/Makefile	(revision 333495)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=tests
-TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/migration/
+TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/migration
 FILESDIR=${TESTSDIR}
 
 ATF_TESTS_KSH93+=	migration_test
 TEST_METADATA+=		required_user="root"
 TEST_METADATA+=		is_exclusive=true
 
 ${PACKAGE}FILES+=	migration_011_pos.ksh
 ${PACKAGE}FILES+=	migration_008_pos.ksh
 ${PACKAGE}FILES+=	migration_004_pos.ksh
 ${PACKAGE}FILES+=	migration.cfg
 ${PACKAGE}FILES+=	setup.ksh
 ${PACKAGE}FILES+=	cleanup.ksh
 ${PACKAGE}FILES+=	migration_005_pos.ksh
 ${PACKAGE}FILES+=	migration_001_pos.ksh
 ${PACKAGE}FILES+=	migration_009_pos.ksh
 ${PACKAGE}FILES+=	migration_010_pos.ksh
 ${PACKAGE}FILES+=	migration_007_pos.ksh
 ${PACKAGE}FILES+=	migration_003_pos.ksh
 ${PACKAGE}FILES+=	migration_012_pos.ksh
 ${PACKAGE}FILES+=	migration.kshlib
 ${PACKAGE}FILES+=	migration_006_pos.ksh
 ${PACKAGE}FILES+=	migration_002_pos.ksh
 
 .include <bsd.test.mk>
Index: head/tests/sys/cddl/zfs/tests/mount/Makefile
===================================================================
--- head/tests/sys/cddl/zfs/tests/mount/Makefile	(revision 333494)
+++ head/tests/sys/cddl/zfs/tests/mount/Makefile	(revision 333495)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=tests
-TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mount/
+TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mount
 FILESDIR=${TESTSDIR}
 
 ATF_TESTS_KSH93+=	mount_test
 TEST_METADATA+=		required_user="root"
 TEST_METADATA+=		is_exclusive=true
 
 ${PACKAGE}FILES+=	vars.cfg
 ${PACKAGE}FILES+=	mounttest.ksh
 ${PACKAGE}FILES+=	mount_test.sh
 ${PACKAGE}FILES+=	cleanup.ksh
 ${PACKAGE}FILES+=	setup.ksh
 
 .include <bsd.test.mk>