diff --git a/ChangeLog b/ChangeLog
index ebf3e1d01..09203eca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,14 +3,15 @@
    code changes.
  - (dtucker) OpenBSD CVS Sync regress/
    - djm@cvs.openbsd.org 2004/04/27 09:47:30
-     [Makefile test-exec.sh]
+     [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
      regress test for environment passing, SendEnv & AcceptEnv options;
      ok markus@
    - dtucker@cvs.openbsd.org 2004/06/13 13:51:02
-     [Makefile test-exec.sh]
+     [regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh
+     regress/scp.sh]
      Add scp regression test; with & ok markus@
    - djm@cvs.openbsd.org 2004/06/13 15:04:08
-     [Makefile test-exec.sh]
+     [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
      regress test for client multiplexing; ok markus@
    - djm@cvs.openbsd.org 2004/06/13 15:16:54
      [regress/test-exec.sh]
@@ -1240,4 +1241,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3392 2004/06/16 10:31:18 dtucker Exp $
+$Id: ChangeLog,v 1.3393 2004/06/16 10:33:55 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
new file mode 100644
index 000000000..67044d421
--- /dev/null
+++ b/regress/envpass.sh
@@ -0,0 +1,44 @@
+#	$OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
+#	Placed in the Public Domain.
+
+tid="environment passing"
+
+# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST)
+
+trace "pass env, don't accept"
+verbose "test $tid: pass env, don't accept"
+_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_TEST_ENV" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "don't pass env, accept"
+verbose "test $tid: don't pass env, accept"
+${SSH} -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "pass single env, accept single env"
+verbose "test $tid: pass single env, accept single env"
+_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \
+	'[ "x$_XXX_TEST" = "xblah" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+
+trace "pass multiple env, accept multiple env"
+verbose "test $tid: pass multiple env, accept multiple env"
+_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \
+    -F $OBJ/ssh_proxy otherhost \
+	'[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+