diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 072eda3f1c..5dd315c225 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -502,9 +502,9 @@ for dir in "${isystem_includes[@]}";         do args+=("-isystem" "$dir"); done
 IFS=':' read -ra spack_include_dirs <<< "$SPACK_INCLUDE_DIRS"
 if [[ $mode == cpp || $mode == cc || $mode == as || $mode == ccld ]]; then
     if [[ "$isystem_was_used" == "true" ]] ; then
-	for dir in "${spack_include_dirs[@]}";  do args+=("-isystem" "$dir"); done
+        for dir in "${spack_include_dirs[@]}";  do args+=("-isystem" "$dir"); done
     else
-	for dir in "${spack_include_dirs[@]}";  do args+=("-I$dir"); done
+        for dir in "${spack_include_dirs[@]}";  do args+=("-I$dir"); done
     fi
 fi
 
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index cbee4428d0..a64e371f0c 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -303,12 +303,12 @@ _spack_pathadd PATH "${_sp_prefix%/}/bin"
 # Check whether a function of the given name is defined
 #
 _spack_fn_exists() {
-	LANG= type $1 2>&1 | grep -q 'function'
+    LANG= type $1 2>&1 | grep -q 'function'
 }
 
 need_module="no"
 if ! _spack_fn_exists use && ! _spack_fn_exists module; then
-	need_module="yes"
+    need_module="yes"
 fi;
 
 # Define the spack shell function with some informative no-ops, so when users
diff --git a/share/spack/setup-tutorial-env.sh b/share/spack/setup-tutorial-env.sh
index 102d2b1c48..16c34ecd43 100755
--- a/share/spack/setup-tutorial-env.sh
+++ b/share/spack/setup-tutorial-env.sh
@@ -95,16 +95,16 @@ INSTANCEID=$(curl http://169.254.169.254/latest/meta-data//instance-id)
 
 # Get the ID of the Amazon EBS volume associated with the instance.
 VOLUMEID=$(aws ec2 describe-instances \
-	       --instance-id $INSTANCEID \
-	       --query "Reservations[0].Instances[0].BlockDeviceMappings[0].Ebs.VolumeId" \
-	       --output text)
+           --instance-id $INSTANCEID \
+           --query "Reservations[0].Instances[0].BlockDeviceMappings[0].Ebs.VolumeId" \
+           --output text)
 
 # Resize the EBS volume.
 aws ec2 modify-volume --volume-id $VOLUMEID --size $SIZE
 
 # Wait for the resize to finish.
 while [ \
-	  "$(aws ec2 describe-volumes-modifications \
+      "$(aws ec2 describe-volumes-modifications \
     --volume-id $VOLUMEID \
     --filters Name=modification-state,Values="optimizing","completed" \
     --query "length(VolumesModifications)"\