diff --git a/.gitignore b/.gitignore
index d72736e..11a7953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ HEAD
 src
 v*
 alias
+
+# For testing
+bak
diff --git a/test/fast/setup b/test/fast/setup
index 49a3cb8..b433b5c 100755
--- a/test/fast/setup
+++ b/test/fast/setup
@@ -4,7 +4,6 @@
   cd ../..
 
   # Back up
-  mkdir -p bak
-  mv v* src alias bak || sleep 0s
+  rm -Rf v* src alias
   mkdir src alias
 )
diff --git a/test/fast/setup_dir b/test/fast/setup_dir
new file mode 100755
index 0000000..1bba6c2
--- /dev/null
+++ b/test/fast/setup_dir
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+(
+  cd ../..
+
+  # Back up
+  mkdir -p bak
+  mv v* src alias bak || sleep 0s
+)
diff --git a/test/fast/teardown b/test/fast/teardown
index 0582ecc..954850f 100755
--- a/test/fast/teardown
+++ b/test/fast/teardown
@@ -1,16 +1,7 @@
 #!/bin/sh
-set -e
 
+# Remove temporary files
 (
   cd ../..
-
-  # Remove temporary files
   rm -fR v* src alias
-
-  # Restore
-  if [ -d bak ]
-    then
-    mv bak/* . || sleep 0s
-    rmdir bak
-  fi
 )
diff --git a/test/fast/teardown_dir b/test/fast/teardown_dir
new file mode 100755
index 0000000..1e6d005
--- /dev/null
+++ b/test/fast/teardown_dir
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+(
+  cd ../..
+
+  # Restore
+  if [ -d bak ]
+    then
+    mv bak/* . || sleep 0s
+    rmdir bak
+  fi
+  mkdir -p src alias
+)
diff --git a/test/fast/uninstall b/test/fast/uninstall
new file mode 100755
index 0000000..ba1ddbb
--- /dev/null
+++ b/test/fast/uninstall
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd ../..
+mkdir v0.0.1
+mkdir src/node-v0.0.1
+
+. ./nvm.sh
+nvm uninstall v0.0.1
+
+[ ! -d 'v0.0.1' ] && [ ! -d 'src/node-v0.0.1' ]