diff --git a/test/fast/deactivate b/test/fast/deactivate
new file mode 100755
index 0000000..1dcef65
--- /dev/null
+++ b/test/fast/deactivate
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. ../../nvm.sh
+nvm &&
+nvm deactivate &&
+! nvm
diff --git a/test/fast/ls b/test/fast/ls
new file mode 100755
index 0000000..065e6fd
--- /dev/null
+++ b/test/fast/ls
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. ../../nvm.sh
+mkdir -p ../../v0.0.{1,3,9}
+
+# The result should contain the version numbers.
+nvm ls | grep v0.0.1 &&
+nvm ls | grep v0.0.3 &&
+nvm ls | grep v0.0.9
diff --git a/test/fast/setup b/test/fast/setup
new file mode 100755
index 0000000..a043e3b
--- /dev/null
+++ b/test/fast/setup
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+(
+  cd ../..
+
+  # Back up
+  mkdir -p bak
+  mv v* src alias bak || sleep 0s
+)
diff --git a/test/fast/source b/test/fast/source
index f183212..24f8efa 100755
--- a/test/fast/source
+++ b/test/fast/source
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-. ../nvm.sh
+. ../../nvm.sh
 nvm
diff --git a/test/fast/teardown b/test/fast/teardown
new file mode 100755
index 0000000..0582ecc
--- /dev/null
+++ b/test/fast/teardown
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+(
+  cd ../..
+
+  # Remove temporary files
+  rm -fR v* src alias
+
+  # Restore
+  if [ -d bak ]
+    then
+    mv bak/* . || sleep 0s
+    rmdir bak
+  fi
+)