diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile
index c8fac417de85..983db692faff 100644
--- a/bin/sh/tests/execution/Makefile
+++ b/bin/sh/tests/execution/Makefile
@@ -1,65 +1,69 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 ${PACKAGE}FILES+=		bg1.0
 ${PACKAGE}FILES+=		bg2.0
 ${PACKAGE}FILES+=		bg3.0
 ${PACKAGE}FILES+=		bg4.0
 ${PACKAGE}FILES+=		bg5.0
 ${PACKAGE}FILES+=		bg6.0 bg6.0.stdout
 ${PACKAGE}FILES+=		bg7.0
 ${PACKAGE}FILES+=		bg8.0
 ${PACKAGE}FILES+=		bg9.0
 ${PACKAGE}FILES+=		bg10.0 bg10.0.stdout
 ${PACKAGE}FILES+=		env1.0
 ${PACKAGE}FILES+=		fork1.0
 ${PACKAGE}FILES+=		fork2.0
 ${PACKAGE}FILES+=		fork3.0
 ${PACKAGE}FILES+=		func1.0
 ${PACKAGE}FILES+=		func2.0
 ${PACKAGE}FILES+=		func3.0
 ${PACKAGE}FILES+=		hash1.0
 ${PACKAGE}FILES+=		int-cmd1.0
 ${PACKAGE}FILES+=		killed1.0
 ${PACKAGE}FILES+=		killed2.0
 ${PACKAGE}FILES+=		not1.0
 ${PACKAGE}FILES+=		not2.0
 ${PACKAGE}FILES+=		path1.0
 ${PACKAGE}FILES+=		pipefail1.0
 ${PACKAGE}FILES+=		pipefail2.42
 ${PACKAGE}FILES+=		pipefail3.42
 ${PACKAGE}FILES+=		pipefail4.42
 ${PACKAGE}FILES+=		pipefail5.42
 ${PACKAGE}FILES+=		pipefail6.42
 ${PACKAGE}FILES+=		pipefail7.0
 ${PACKAGE}FILES+=		redir1.0
 ${PACKAGE}FILES+=		redir2.0
 ${PACKAGE}FILES+=		redir3.0
 ${PACKAGE}FILES+=		redir4.0
 ${PACKAGE}FILES+=		redir5.0
 ${PACKAGE}FILES+=		redir6.0
 ${PACKAGE}FILES+=		redir7.0
 ${PACKAGE}FILES+=		set-C1.0
 ${PACKAGE}FILES+=		set-n1.0
 ${PACKAGE}FILES+=		set-n2.0
 ${PACKAGE}FILES+=		set-n3.0
 ${PACKAGE}FILES+=		set-n4.0
 ${PACKAGE}FILES+=		set-x1.0
 ${PACKAGE}FILES+=		set-x2.0
 ${PACKAGE}FILES+=		set-x3.0
 ${PACKAGE}FILES+=		set-x4.0
 ${PACKAGE}FILES+=		shellproc1.0
+${PACKAGE}FILES+=		shellproc2.0
+${PACKAGE}FILES+=		shellproc3.0
+${PACKAGE}FILES+=		shellproc4.0
+${PACKAGE}FILES+=		shellproc5.0
 ${PACKAGE}FILES+=		subshell1.0 subshell1.0.stdout
 ${PACKAGE}FILES+=		subshell2.0
 ${PACKAGE}FILES+=		subshell3.0
 ${PACKAGE}FILES+=		subshell4.0
 ${PACKAGE}FILES+=		unknown1.0
 ${PACKAGE}FILES+=		var-assign1.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/execution/shellproc2.0 b/bin/sh/tests/execution/shellproc2.0
new file mode 100644
index 000000000000..85e768070022
--- /dev/null
+++ b/bin/sh/tests/execution/shellproc2.0
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# This tests a quality of implementation issue.
+# Shells are not required to reject executing binary files as shell scripts
+# but executing, for example, ELF files for a different architecture as
+# shell scripts may have annoying side effects.
+
+T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit
+trap 'rm -rf "${T}"' 0
+printf '\0' >"$T/testshellproc"
+chmod 755 "$T/testshellproc"
+if [ ! -s "$T/testshellproc" ]; then
+	printf "printf did not write a NUL character\n" >&2
+	exit 2
+fi
+PATH=$T:$PATH
+errout=`testshellproc 3>&2 2>&1 >&3 3>&-`
+r=$?
+[ "$r" = 126 ] && [ -n "$errout" ]
diff --git a/bin/sh/tests/execution/shellproc3.0 b/bin/sh/tests/execution/shellproc3.0
new file mode 100644
index 000000000000..6ad455f2cd77
--- /dev/null
+++ b/bin/sh/tests/execution/shellproc3.0
@@ -0,0 +1,14 @@
+# $FreeBSD$
+# This tests a quality of implementation issue.
+# Shells are not required to reject executing binary files as shell scripts
+# but executing, for example, ELF files for a different architecture as
+# shell scripts may have annoying side effects.
+
+T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit
+trap 'rm -rf "${T}"' 0
+printf '\177ELF\001!!\011\0\0\0\0\0\0\0\0' >"$T/testshellproc"
+chmod 755 "$T/testshellproc"
+PATH=$T:$PATH
+errout=`testshellproc 3>&2 2>&1 >&3 3>&-`
+r=$?
+[ "$r" = 126 ] && [ -n "$errout" ]
diff --git a/bin/sh/tests/execution/shellproc4.0 b/bin/sh/tests/execution/shellproc4.0
new file mode 100644
index 000000000000..fcc72eef073c
--- /dev/null
+++ b/bin/sh/tests/execution/shellproc4.0
@@ -0,0 +1,14 @@
+# $FreeBSD$
+# This tests a quality of implementation issue.
+# Shells are not required to reject executing binary files as shell scripts
+# but executing, for example, ELF files for a different architecture as
+# shell scripts may have annoying side effects.
+
+T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit
+trap 'rm -rf "${T}"' 0
+printf '\211PNG\015\012\032\012\0\0\0\015IHDR' >"$T/testshellproc"
+chmod 755 "$T/testshellproc"
+PATH=$T:$PATH
+errout=`testshellproc 3>&2 2>&1 >&3 3>&-`
+r=$?
+[ "$r" = 126 ] && [ -n "$errout" ]
diff --git a/bin/sh/tests/execution/shellproc5.0 b/bin/sh/tests/execution/shellproc5.0
new file mode 100644
index 000000000000..c25ffe3e4693
--- /dev/null
+++ b/bin/sh/tests/execution/shellproc5.0
@@ -0,0 +1,14 @@
+# $FreeBSD$
+# This tests a quality of implementation issue.
+# Shells are not required to reject executing binary files as shell scripts
+# but executing, for example, ELF files for a different architecture as
+# shell scripts may have annoying side effects.
+
+T=`mktemp -d "${TMPDIR:-/tmp}/sh-test.XXXXXXXX"` || exit
+trap 'rm -rf "${T}"' 0
+printf '\177ELF\001!!\012\0\0\0\0\0\0\0\0' >"$T/testshellproc"
+chmod 755 "$T/testshellproc"
+PATH=$T:$PATH
+errout=`testshellproc 3>&2 2>&1 >&3 3>&-`
+r=$?
+[ "$r" = 126 ] && [ -n "$errout" ]