diff --git a/test/installation_iojs/install from source b/test/installation_iojs/install from source
index 5496b2c..354de49 100755
--- a/test/installation_iojs/install from source	
+++ b/test/installation_iojs/install from source	
@@ -6,16 +6,17 @@ die () { echo $@ ; exit 1; }
 
 . ../../nvm.sh
 
-NVM_TEST_VERSION="v1.0.0"
-NVM_PREFIXED_TEST_VERSION="iojs-$NVM_TEST_VERSION"
+set -ex
+
+NVM_TEST_VERSION='v3.3.1'
+NVM_PREFIXED_TEST_VERSION="iojs-${NVM_TEST_VERSION}"
 
 # Remove the stuff we're clobbering.
-[ -e ../../versions/io.js/$NVM_TEST_VERSION ] && rm -R ../../versions/io.js/$NVM_TEST_VERSION
+nvm uninstall "${NVM_TEST_VERSION}" || echo 'not installed'
 
 # Install from source
-(watch nvm install -s $NVM_PREFIXED_TEST_VERSION) || die "'nvm install -s $NVM_PREFIXED_TEST_VERSION' failed"
+(watch nvm install -s "${NVM_PREFIXED_TEST_VERSION}") || die "'nvm install -s ${NVM_PREFIXED_TEST_VERSION}' failed"
 
 # Check
-[ -d ../../versions/io.js/$NVM_TEST_VERSION ]
-nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
-
+nvm_is_version_installed "${NVM_PREFIXED_TEST_VERSION}" || die 'version not installed'
+nvm run "${NVM_PREFIXED_TEST_VERSION}" --version | grep "${NVM_TEST_VERSION}" || "'nvm run ${NVM_PREFIXED_TEST_VERSION} --version | grep ${NVM_TEST_VERSION}' failed"
diff --git a/test/installation_iojs/install version specified in .nvmrc from source b/test/installation_iojs/install version specified in .nvmrc from source
index d17a6bb..df3f46c 100755
--- a/test/installation_iojs/install version specified in .nvmrc from source	
+++ b/test/installation_iojs/install version specified in .nvmrc from source	
@@ -4,21 +4,20 @@ die () { echo $@ ; exit 1; }
 
 . ../../nvm.sh
 
-NVM_TEST_VERSION=v1.0.3
-NVM_PREFIXED_TEST_VERSION="iojs-$NVM_TEST_VERSION"
-VERSION_PATH="../../versions/io.js/$NVM_TEST_VERSION"
+set -ex
+
+NVM_TEST_VERSION='v3.3.0'
+NVM_PREFIXED_TEST_VERSION="iojs-${NVM_TEST_VERSION}"
 
 # Remove the stuff we're clobbering.
-[ -e "$VERSION_PATH" ] && rm -R "$VERSION_PATH"
+nvm uninstall "${NVM_TEST_VERSION}" || echo 'not installed'
 
 # Install from binary
-echo "$NVM_PREFIXED_TEST_VERSION" > .nvmrc
+echo "${NVM_PREFIXED_TEST_VERSION}" > .nvmrc
 
 nvm install -s || "'nvm install -s' failed"
 
 # Check
-[ -d "$VERSION_PATH" ] || die "$VERSION_PATH did not exist"
-nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION \
-  || die "'nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
-
-
+nvm_is_version_installed "${NVM_PREFIXED_TEST_VERSION}" || die 'version is not installed'
+nvm run "${NVM_PREFIXED_TEST_VERSION}" --version | grep "${NVM_TEST_VERSION}" \
+  || die "'nvm run ${NVM_PREFIXED_TEST_VERSION} --version | grep ${NVM_TEST_VERSION}' failed"
diff --git a/test/installation_iojs/teardown_dir b/test/installation_iojs/teardown_dir
index d45c66a..295db62 100755
--- a/test/installation_iojs/teardown_dir
+++ b/test/installation_iojs/teardown_dir
@@ -4,6 +4,8 @@
 nvm deactivate
 nvm uninstall iojs-v1.0.0
 nvm uninstall iojs-v1.0.3
+nvm uninstall iojs-v3.3.0
+nvm uninstall iojs-v3.3.1
 
 if [ -f ".nvmrc" ]; then
   rm .nvmrc