diff --git a/test/installation/install already installed uses it b/test/installation/node/install already installed uses it
similarity index 83%
rename from test/installation/install already installed uses it
rename to test/installation/node/install already installed uses it
index 8a7dd9a..ffcbb02 100755
--- a/test/installation/install already installed uses it	
+++ b/test/installation/node/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/installation/install from binary b/test/installation/node/install from binary
similarity index 74%
rename from test/installation/install from binary
rename to test/installation/node/install from binary
index cdc0e7a..3e17e8e 100755
--- a/test/installation/install from binary	
+++ b/test/installation/node/install from binary	
@@ -2,17 +2,17 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../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 || die "install $NVM_TEST_VERSION failed"
 
 # Check
-[ -d ../../$NVM_TEST_VERSION ]
+[ -d ../../../$NVM_TEST_VERSION ]
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || die "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
 
diff --git a/test/installation/install from source b/test/installation/node/install from source
similarity index 74%
rename from test/installation/install from source
rename to test/installation/node/install from source
index 25a0f1e..3cf0389 100755
--- a/test/installation/install from source	
+++ b/test/installation/node/install from source	
@@ -2,17 +2,17 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../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 || die "'nvm install -s $NVM_TEST_VERSION' failed"
 
 # Check
-[ -d ../../$NVM_TEST_VERSION ]
+[ -d ../../../$NVM_TEST_VERSION ]
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
 
diff --git a/test/installation/install two versions and use the latest one b/test/installation/node/install two versions and use the latest one
similarity index 66%
rename from test/installation/install two versions and use the latest one
rename to test/installation/node/install two versions and use the latest one
index 77dc9e4..1fedace 100755
--- a/test/installation/install two versions and use the latest one	
+++ b/test/installation/node/install two versions and use the latest one	
@@ -2,19 +2,19 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../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 || die "'nvm install 0.9.7' failed"
 nvm i 0.9.12 || die "'nvm i 0.9.12' failed"
 
 # Check
-[ -d ../../v0.9.7 ] || die "v0.9.7 didn't exist"
-[ -d ../../v0.9.12 ] || die "v0.9.12 didn't exist"
+[ -d ../../../v0.9.7 ] || die "v0.9.7 didn't exist"
+[ -d ../../../v0.9.12 ] || die "v0.9.12 didn't exist"
 
 # Use the first one
 nvm use 0.9.7 || die "'nvm use 0.9.7' failed"
diff --git a/test/installation/install version specified in .nvmrc from binary b/test/installation/node/install version specified in .nvmrc from binary
similarity index 68%
rename from test/installation/install version specified in .nvmrc from binary
rename to test/installation/node/install version specified in .nvmrc from binary
index ad5f296..859a199 100755
--- a/test/installation/install version specified in .nvmrc from binary	
+++ b/test/installation/node/install version specified in .nvmrc from binary	
@@ -2,12 +2,12 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../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
@@ -15,7 +15,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc
 nvm install || die "'nvm install' failed"
 
 # Check
-[ -d ../../$NVM_TEST_VERSION ] || die "./$NVM_TEST_VERSION did not exist"
+[ -d ../../../$NVM_TEST_VERSION ] || die "./$NVM_TEST_VERSION did not exist"
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION \
   || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
 
diff --git a/test/installation/install version specified in .nvmrc from source b/test/installation/node/install version specified in .nvmrc from source
similarity index 68%
rename from test/installation/install version specified in .nvmrc from source
rename to test/installation/node/install version specified in .nvmrc from source
index 63ea0ea..6952645 100755
--- a/test/installation/install version specified in .nvmrc from source	
+++ b/test/installation/node/install version specified in .nvmrc from source	
@@ -2,12 +2,12 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../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
@@ -15,7 +15,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc
 nvm install -s || "'nvm install -s' failed"
 
 # Check
-[ -d ../../$NVM_TEST_VERSION ] || die "$NVM_TEST_VERSION did not exist"
+[ -d ../../../$NVM_TEST_VERSION ] || die "$NVM_TEST_VERSION did not exist"
 nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION \
   || die "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
 
diff --git a/test/installation/install while reinstalling packages b/test/installation/node/install while reinstalling packages
similarity index 74%
rename from test/installation/install while reinstalling packages
rename to test/installation/node/install while reinstalling packages
index 76eb7e5..9298212 100755
--- a/test/installation/install while reinstalling packages	
+++ b/test/installation/node/install while reinstalling packages	
@@ -2,17 +2,17 @@
 
 die () { echo $@ ; exit 1; }
 
-. ../../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
 
 # Check
-[ -d ../../v0.9.7 ] || die "nvm install 0.9.7 didn't install"
+[ -d ../../../v0.9.7 ] || die "nvm install 0.9.7 didn't install"
 
 nvm use 0.9.7
 
@@ -25,7 +25,7 @@ nvm ls 0.9 | grep v0.9.7 > /dev/null || die "nvm ls 0.9 didn't show v0.9.7"
 
 nvm install 0.9.12 --reinstall-packages-from=0.9 || die "nvm install 0.9.12 --reinstall-packages-from=0.9 failed"
 
-[ -d ../../v0.9.12 ] || die "nvm install 0.9.12 didn't install"
+[ -d ../../../v0.9.12 ] || die "nvm install 0.9.12 didn't install"
 
 nvm use 0.9
 node --version | grep v0.9.12 > /dev/null || die "nvm ls 0.9 didn't use v0.9.12"
diff --git a/test/installation/setup_dir b/test/installation/node/setup_dir
similarity index 100%
rename from test/installation/setup_dir
rename to test/installation/node/setup_dir
diff --git a/test/installation/teardown_dir b/test/installation/node/teardown_dir
similarity index 89%
rename from test/installation/teardown_dir
rename to test/installation/node/teardown_dir
index 941ca99..8285de3 100755
--- a/test/installation/teardown_dir
+++ b/test/installation/node/teardown_dir
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../../nvm.sh
+. ../../../nvm.sh
 nvm deactivate
 nvm uninstall v0.10.7