diff --git a/.travis.yml b/.travis.yml
index ba1b1bc..d3491ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,20 +10,22 @@ script:
   - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
 env:
   - SHELL=sh TEST_SUITE=fast
-  - SHELL=sh TEST_SUITE=fast WITHOUT_CURL=1
   - SHELL=dash TEST_SUITE=fast
-  - SHELL=dash TEST_SUITE=fast WITHOUT_CURL=1
   - SHELL=bash TEST_SUITE=fast
-  - SHELL=bash TEST_SUITE=fast WITHOUT_CURL=1
   - SHELL=zsh TEST_SUITE=fast
-  - SHELL=zsh TEST_SUITE=fast WITHOUT_CURL=1
   - SHELL=ksh TEST_SUITE=fast
-  - SHELL=ksh TEST_SUITE=fast WITHOUT_CURL=1
   - SHELL=sh TEST_SUITE=slow
-  - SHELL=sh TEST_SUITE=slow WITHOUT_CURL=1
   - SHELL=dash TEST_SUITE=slow
-  - SHELL=dash TEST_SUITE=slow WITHOUT_CURL=1
   - SHELL=bash TEST_SUITE=slow
-  - SHELL=bash TEST_SUITE=slow WITHOUT_CURL=1
   - SHELL=zsh TEST_SUITE=slow
-  - SHELL=zsh TEST_SUITE=slow WITHOUT_CURL=1
+  - SHELL=ksh TEST_SUITE=slow
+  - SHELL=sh TEST_SUITE=installation
+  - SHELL=sh TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=dash TEST_SUITE=installation
+  - SHELL=dash TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=bash TEST_SUITE=installation
+  - SHELL=bash TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=zsh TEST_SUITE=installation
+  - SHELL=zsh TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=ksh TEST_SUITE=installation
+  - SHELL=ksh TEST_SUITE=installation WITHOUT_CURL=1
diff --git a/package.json b/package.json
index 96bc191..1c810ad 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
   "scripts": {
     "test": "urchin test",
     "test/fast": "urchin -f test/fast",
-    "test/slow": "urchin -f test/slow"
+    "test/slow": "urchin -f test/slow",
+    "test/installation": "urchin -f test/installation"
   },
   "repository": {
     "type": "git",
diff --git a/test/slow/nvm install/install already installed uses it b/test/installation/install already installed uses it
similarity index 83%
rename from test/slow/nvm install/install already installed uses it
rename to test/installation/install already installed uses it
index ffcbb02..8a7dd9a 100755
--- a/test/slow/nvm install/install already installed uses it	
+++ b/test/installation/install already installed uses it	
@@ -2,13 +2,13 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../../nvm.sh
+. ../../nvm.sh
 
 [ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message"
 
 # Remove the stuff we're clobbering.
-[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7
-[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12
+[ -e ../../v0.9.7 ] && rm -R ../../v0.9.7
+[ -e ../../v0.9.12 ] && rm -R ../../v0.9.12
 
 # Install from binary
 nvm install 0.9.7
diff --git a/test/slow/nvm install/install from binary b/test/installation/install from binary
similarity index 62%
rename from test/slow/nvm install/install from binary
rename to test/installation/install from binary
index 82124e0..9138933 100755
--- a/test/slow/nvm install/install from binary	
+++ b/test/installation/install from binary	
@@ -1,17 +1,17 @@
 #!/bin/sh
 
 set -e
-. ../../../nvm.sh
+. ../../nvm.sh
 
 NVM_TEST_VERSION=v0.10.7
 
 # Remove the stuff we're clobbering.
-[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
 
 # Install from binary
 nvm install $NVM_TEST_VERSION
 
 # Check
-[ -d ../../../$NVM_TEST_VERSION ]
+[ -d ../../$NVM_TEST_VERSION ]
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
 
diff --git a/test/slow/nvm install/install from source b/test/installation/install from source
similarity index 63%
rename from test/slow/nvm install/install from source
rename to test/installation/install from source
index fdb5c0e..a535b75 100755
--- a/test/slow/nvm install/install from source	
+++ b/test/installation/install from source	
@@ -1,17 +1,17 @@
 #!/bin/sh
 
 set -e
-. ../../../nvm.sh
+. ../../nvm.sh
 
 NVM_TEST_VERSION=v0.10.7
 
 # Remove the stuff we're clobbering.
-[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
 
 # Install from source
 nvm install -s $NVM_TEST_VERSION
 
 # Check
-[ -d ../../../$NVM_TEST_VERSION ]
+[ -d ../../$NVM_TEST_VERSION ]
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
 
diff --git a/test/slow/nvm install/install two versions and use the latest one b/test/installation/install two versions and use the latest one
similarity index 57%
rename from test/slow/nvm install/install two versions and use the latest one
rename to test/installation/install two versions and use the latest one
index df6670d..9f50510 100755
--- a/test/slow/nvm install/install two versions and use the latest one	
+++ b/test/installation/install two versions and use the latest one	
@@ -1,19 +1,19 @@
 #!/bin/sh
 
 set -e
-. ../../../nvm.sh
+. ../../nvm.sh
 
 # Remove the stuff we're clobbering.
-[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7
-[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12
+[ -e ../../v0.9.7 ] && rm -R ../../v0.9.7
+[ -e ../../v0.9.12 ] && rm -R ../../v0.9.12
 
 # Install from binary
 nvm install 0.9.7
 nvm i 0.9.12
 
 # Check
-[ -d ../../../v0.9.7 ]
-[ -d ../../../v0.9.12 ]
+[ -d ../../v0.9.7 ]
+[ -d ../../v0.9.12 ]
 
 # Use the first one
 nvm use 0.9.7
diff --git a/test/slow/nvm install/install version specified in .nvmrc from binary b/test/installation/install version specified in .nvmrc from binary
similarity index 64%
rename from test/slow/nvm install/install version specified in .nvmrc from binary
rename to test/installation/install version specified in .nvmrc from binary
index 7758afe..b261970 100755
--- a/test/slow/nvm install/install version specified in .nvmrc from binary	
+++ b/test/installation/install version specified in .nvmrc from binary	
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 set -e
-. ../../../nvm.sh
+. ../../nvm.sh
 
 NVM_TEST_VERSION=v0.10.7
 
 # Remove the stuff we're clobbering.
-[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
 
 # Install from binary
 echo "$NVM_TEST_VERSION" > .nvmrc
@@ -14,7 +14,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc
 nvm install
 
 # Check
-[ -d ../../../$NVM_TEST_VERSION ]
+[ -d ../../$NVM_TEST_VERSION ]
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
 
 
diff --git a/test/slow/nvm install/install version specified in .nvmrc from source b/test/installation/install version specified in .nvmrc from source
similarity index 65%
rename from test/slow/nvm install/install version specified in .nvmrc from source
rename to test/installation/install version specified in .nvmrc from source
index 189fffa..5544d0e 100755
--- a/test/slow/nvm install/install version specified in .nvmrc from source	
+++ b/test/installation/install version specified in .nvmrc from source	
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 set -e
-. ../../../nvm.sh
+. ../../nvm.sh
 
 NVM_TEST_VERSION=v0.10.7
 
 # Remove the stuff we're clobbering.
-[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
 
 # Install from binary
 echo "$NVM_TEST_VERSION" > .nvmrc
@@ -14,7 +14,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc
 nvm install -s
 
 # Check
-[ -d ../../../$NVM_TEST_VERSION ]
+[ -d ../../$NVM_TEST_VERSION ]
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
 
 
diff --git a/test/slow/nvm install/setup_dir b/test/installation/setup_dir
similarity index 100%
rename from test/slow/nvm install/setup_dir
rename to test/installation/setup_dir
diff --git a/test/slow/nvm install/teardown_dir b/test/installation/teardown_dir
similarity index 87%
rename from test/slow/nvm install/teardown_dir
rename to test/installation/teardown_dir
index 3f107c9..7637390 100755
--- a/test/slow/nvm install/teardown_dir	
+++ b/test/installation/teardown_dir
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../../../nvm.sh
+. ../../nvm.sh
 nvm uninstall v0.10.7
 
 if [ -f ".nvmrc" ]; then