diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run
index a704c0ae7..629f0908a 100644
--- a/tests/runfiles/common.run
+++ b/tests/runfiles/common.run
@@ -254,8 +254,8 @@ tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg',
 tags = ['functional', 'cli_root', 'zfs_snapshot']
 
 [tests/functional/cli_root/zfs_sysfs]
-tests = ['zfeature_set_unsupported.ksh', 'zfs_get_unsupported',
-    'zfs_set_unsupported', 'zfs_sysfs_live.ksh', 'zpool_get_unsupported',
+tests = ['zfeature_set_unsupported', 'zfs_get_unsupported',
+    'zfs_set_unsupported', 'zfs_sysfs_live', 'zpool_get_unsupported',
     'zpool_set_unsupported']
 tags = ['functional', 'cli_root', 'zfs_sysfs']
 
@@ -617,7 +617,7 @@ tests = ['filesystem_count', 'filesystem_limit', 'snapshot_count',
 tags = ['functional', 'limits']
 
 [tests/functional/link_count]
-tests = ['link_count_001', 'link_count_root_inode.ksh']
+tests = ['link_count_001', 'link_count_root_inode']
 tags = ['functional', 'link_count']
 
 [tests/functional/migration]
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
index c208a1c37..8a137b830 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
@@ -19,7 +19,7 @@ dist_pkgdata_SCRIPTS = \
 	zfs_mount_all_mountpoints.ksh \
 	zfs_mount_encrypted.ksh \
 	zfs_mount_remount.ksh \
-	zfs_mount_test_race.sh \
+	zfs_mount_test_race.ksh \
 	zfs_multi_mount.ksh
 
 dist_pkgdata_DATA = \
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh
similarity index 100%
rename from tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
rename to tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh