diff --git a/tests/atexit-1 b/tests/atexit-1
line changes: +36/-0
index 0000000..e10fb41
--- /dev/null
+++ b/tests/atexit-1

@@ -0,0 +1,36 @@
+#! /bin/sh
+# Test atexit handling.
+#
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+if ! [ -c /dev/full ]; then
+  # no such character device, skip this check
+  exit 77
+fi
+
+tmpfiles="atexit-test1.ok"
+cat <<EOF >atexit-test1.ok
+hello: write error: No space left on device
+EOF
+
+tmpfiles="$tmpfiles atexit-test1.out"
+: ${HELLO=hello}
+${HELLO} 2>&1 1>/dev/full | tr -d '\r' >atexit-test1.out
+
+# remove \r (CR) characters from the output, so that the tests work on
+# platforms with CRLF line endings.  There is apparently no reliable
+# method (across Cygwin, MingW, etc.) to force an eol style.
+
+: ${DIFF=diff}
+${DIFF} atexit-test1.ok atexit-test1.out
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result

diff --git a/tests/operand-1 b/tests/operand-1
line changes: +32/-0
index 0000000..a777600
--- /dev/null
+++ b/tests/operand-1

@@ -0,0 +1,32 @@
+#! /bin/sh
+# Test extra operands fail correct way.
+#
+# Copyright (C) 2019 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="operand-test1.ok"
+cat <<EOF >operand-test1.ok
+hello: extra operand: first
+Try 'hello --help' for more information.
+EOF
+
+tmpfiles="$tmpfiles operand-test1.out"
+: ${HELLO=hello}
+${HELLO} first second 2>&1 | tr -d '\r' >operand-test1.out
+
+# remove \r (CR) characters from the output, so that the tests work on
+# platforms with CRLF line endings.  There is apparently no reliable
+# method (across Cygwin, MingW, etc.) to force an eol style.
+
+: ${DIFF=diff}
+${DIFF} operand-test1.ok operand-test1.out
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result