diff --git "a/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables." "b/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables."
index 1dcef65..0f2ad3b 100755
--- "a/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables."	
+++ "b/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables."	
@@ -1,6 +1,14 @@
 #!/bin/sh
 
+mkdir -p ../../v0.2.3
+
+die () { echo $@ ; exit 1; }
+
+[[ $PATH != *v0.2.3/*/bin* ]] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2
+
 . ../../nvm.sh
-nvm &&
+nvm use v0.2.3 &&
+[[ $PATH == *v0.2.3/*/bin* ]] || die "Failed to activate v0.2.3"
+
 nvm deactivate &&
-! nvm
+[[ $PATH != *v0.2.3/*/bin* ]] || die "Failed to deactivate v0.2.3"
diff --git a/test/fast/setup b/test/fast/setup
index b433b5c..f98394b 100755
--- a/test/fast/setup
+++ b/test/fast/setup
@@ -4,6 +4,9 @@
   cd ../..
 
   # Back up
+
+  type setopt >/dev/null 2>&1 && setopt NULL_GLOB
+  type shopt >/dev/null 2>&1 && shopt -s nullglob
   rm -Rf v* src alias
   mkdir src alias
 )
diff --git a/test/fast/setup_dir b/test/fast/setup_dir
index 1bba6c2..75e67e3 100755
--- a/test/fast/setup_dir
+++ b/test/fast/setup_dir
@@ -4,6 +4,9 @@
   cd ../..
 
   # Back up
+
+  type setopt >/dev/null 2>&1 && setopt NULL_GLOB
+  type shopt >/dev/null 2>&1 && shopt -s nullglob
   mkdir -p bak
   mv v* src alias bak || sleep 0s
 )
diff --git a/test/fast/teardown b/test/fast/teardown
index 954850f..bd269eb 100755
--- a/test/fast/teardown
+++ b/test/fast/teardown
@@ -3,5 +3,8 @@
 # Remove temporary files
 (
   cd ../..
+
+  type setopt >/dev/null 2>&1 && setopt NULL_GLOB
+  type shopt >/dev/null 2>&1 && shopt -s nullglob
   rm -fR v* src alias
 )