diff --git a/Makefile.am b/Makefile.am
index a4dccdda6a..07d583fdf4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ dist-hook:
 	sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
 		$(distdir)/META
 
-checkstyle: cstyle shellcheck flake8 commitcheck mancheck
+checkstyle: cstyle shellcheck flake8 commitcheck mancheck testscheck
 
 commitcheck:
 	@if git rev-parse --git-dir > /dev/null 2>&1; then \
@@ -68,6 +68,14 @@ mancheck:
 			xargs mandoc -Tlint -Werror; \
 	fi
 
+testscheck:
+	@find ${top_srcdir}/tests/zfs-tests/tests -type f \
+		\( -name '*.ksh' -not -executable \) -o \
+		\( -name '*.kshlib' -executable \) -o \
+		\( -name '*.cfg' -executable \) | \
+		xargs -r stat -c '%A %n' | \
+		awk '{c++; print} END {if(c>0) exit 1}'
+
 lint: cppcheck paxcheck
 
 cppcheck:
diff --git a/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib b/tests/zfs-tests/tests/functional/casenorm/casenorm.kshlib
old mode 100755
new mode 100644
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.kshlib
old mode 100755
new mode 100644
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.cfg
old mode 100755
new mode 100644
diff --git a/tests/zfs-tests/tests/functional/events/events_common.kshlib b/tests/zfs-tests/tests/functional/events/events_common.kshlib
old mode 100755
new mode 100644
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
old mode 100644
new mode 100755
diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib
old mode 100755
new mode 100644