diff --git a/tests/test-oldcgi b/tests/test-oldcgi
--- a/tests/test-oldcgi
+++ b/tests/test-oldcgi
@@ -58,39 +58,38 @@ h.run()
 HGWEBDIR
 chmod 755 hgwebdir.cgi
 
-declare -x DOCUMENT_ROOT="/var/www/hg"
-declare -x GATEWAY_INTERFACE="CGI/1.1"
-declare -x HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
-declare -x HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"
-declare -x HTTP_ACCEPT_ENCODING="gzip,deflate"
-declare -x HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"
-declare -x HTTP_CACHE_CONTROL="max-age=0"
-declare -x HTTP_CONNECTION="keep-alive"
-declare -x HTTP_HOST="hg.omnifarious.org"
-declare -x HTTP_KEEP_ALIVE="300"
-declare -x HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"
-declare -x OLDPWD
-declare -x PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
-declare -x PATH_INFO="/"
-declare -x PATH_TRANSLATED="/var/www/hg/index.html"
-declare -x PWD="/home/hopper/hg_public"
-declare -x QUERY_STRING=""
-declare -x REMOTE_ADDR="127.0.0.2"
-declare -x REMOTE_PORT="44703"
-declare -x REQUEST_METHOD="GET"
-declare -x REQUEST_URI="/test/"
-declare -x SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"
-declare -x SCRIPT_NAME="/test"
-declare -x SCRIPT_URI="http://hg.omnifarious.org/test/"
-declare -x SCRIPT_URL="/test/"
-declare -x SERVER_ADDR="127.0.0.1"
-declare -x SERVER_ADMIN="eric@localhost"
-declare -x SERVER_NAME="hg.omnifarious.org"
-declare -x SERVER_PORT="80"
-declare -x SERVER_PROTOCOL="HTTP/1.1"
-declare -x SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>\
+DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT
+GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE
+HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT
+HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET
+HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING
+HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE
+HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL
+HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION
+HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST
+HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE
+HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT
+PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"; export PATH
+PATH_INFO="/"; export PATH_INFO
+PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED
+PWD="/home/hopper/hg_public"; export PWD
+QUERY_STRING=""; export QUERY_STRING
+REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR
+REMOTE_PORT="44703"; export REMOTE_PORT
+REQUEST_METHOD="GET"; export REQUEST_METHOD
+REQUEST_URI="/test/"; export REQUEST_URI
+SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME
+SCRIPT_NAME="/test"; export SCRIPT_NAME
+SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI
+SCRIPT_URL="/test/"; export SCRIPT_URL
+SERVER_ADDR="127.0.0.1"; export SERVER_ADDR
+SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN
+SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME
+SERVER_PORT="80"; export SERVER_PORT
+SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL
+SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>\; export SERVER_SIGNATURE
 "
-declare -x SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"
+SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE
 ./hgweb.cgi >page1 2>&1 ; echo $?
 ./hgwebdir.cgi >page2 2>&1 ; echo $?
 PATH_INFO="/test/"