diff --git a/tfv b/tfv
index bf32b84578219418b86818475e4a1573df098820..290c09643f036f6bc59f5578e9b8f64e146b1e7e 100755
--- a/tfv
+++ b/tfv
@@ -1,7 +1,11 @@
 #!/bin/sh
 set -eu
 
-[ -z "${DEBUG:-}" ] || set -x
+if [ -n "${DEBUG:-}" ]
+then
+    set -x
+    env
+fi
 
 command -v terraform >/dev/null || { echo "Can't find the terraform binary, aborting." >&2; exit 1; }