diff --git a/scripts/download-env.sh b/scripts/download-env.sh
index 166834ad7..d0b0b4f2f 100755
--- a/scripts/download-env.sh
+++ b/scripts/download-env.sh
@@ -74,6 +74,10 @@ set -e
 
 . $SETUP_DIR/settings.sh
 
+# If we activate an environment, CONDA_PREFIX is set. Otherwise use CONDA_DIR.
+export CONDA_PREFIX="${CONDA_PREFIX:-$CONDA_DIR}"
+export CONDA_DIR=$CONDA_PREFIX
+
 echo "             This script is: $SETUP_SRC"
 echo "         Firmware directory: $TOP_DIR"
 echo "         Build directory is: $BUILD_DIR"
diff --git a/scripts/enter-env.sh b/scripts/enter-env.sh
index b15c4675e..4f47d3c18 100755
--- a/scripts/enter-env.sh
+++ b/scripts/enter-env.sh
@@ -74,6 +74,10 @@ fi
 
 . $SETUP_DIR/settings.sh
 
+# If we activate an environment, CONDA_PREFIX is set. Otherwise use CONDA_DIR.
+export CONDA_PREFIX="${CONDA_PREFIX:-$CONDA_DIR}"
+export CONDA_DIR=$CONDA_PREFIX
+
 echo "             This script is: $SETUP_SRC"
 echo "         Firmware directory: $TOP_DIR"
 echo "         Build directory is: $BUILD_DIR"