2 files changed, 2 insertions, 2 deletions
diff --git a/share/spack/setup-env.fish b/share/spack/setup-env.fish
index 7bbc8f8485..239fb8709f 100755
--- a/share/spack/setup-env.fish
+++ b/share/spack/setup-env.fish
@@ -703,7 +703,7 @@ set -xg _sp_shell "fish"
 # Check whether we need environment-variables (module) <= `use` is not available
 #
 set -l need_module "no"
-if not functions -q use; and not functions -q module
+if test -z "$SPACK_SKIP_MODULES"; and not functions -q use; and not functions -q module
     set need_module "yes"
 end
 
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index a64e371f0c..dfe265a594 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -307,7 +307,7 @@ _spack_fn_exists() {
 }
 
 need_module="no"
-if ! _spack_fn_exists use && ! _spack_fn_exists module; then
+if [ -z "${SPACK_SKIP_MODULES+x}" ] && ! _spack_fn_exists use && ! _spack_fn_exists module; then
     need_module="yes"
 fi;