diff --git a/tests/test_cli.sh b/tests/test_cli.sh
index fdf151b0..19e943f8 100755
--- a/tests/test_cli.sh
+++ b/tests/test_cli.sh
@@ -4,6 +4,7 @@
 set -eu
 
 export BEAKERLIB_DIR=$(mktemp -d /tmp/composer-test.XXXXXX)
+CLI="${CLI:-}"
 
 function setup_tests {
     local share_dir=$1
diff --git a/tests/testenv.sh b/tests/testenv.sh
index 48074422..f293c1ba 100644
--- a/tests/testenv.sh
+++ b/tests/testenv.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+top_srcdir="${top_srcdir:-}"
+top_buildir="${top_builddir:-}"
+PYTHONPATH="${PYTHONPATH:-}"
+
 if [ -z "$top_srcdir" ]; then
     echo "*** top_srcdir must be set"
     exit 1