diff --git a/scripts/install b/scripts/install
index 5206265..875d1a4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -64,7 +64,7 @@ download_source() {
 }
 
 check_tag() {
-    version=$(cd "$GO_CACHE_PATH" && git tag -l "$VERSION")
+    version=$(cd "$GO_CACHE_PATH" && git show-ref --heads --tags | awk -F/ '{ print $NF }' | $SORT_PATH | $GREP_PATH "$VERSION" | $HEAD_PATH -n 1 | $GREP_PATH -w "$VERSION")
 }
 
 update_source() {
diff --git a/tests/00gvm_install_comment_test.sh b/tests/00gvm_install_comment_test.sh
index 6953511..ff30efd 100644
--- a/tests/00gvm_install_comment_test.sh
+++ b/tests/00gvm_install_comment_test.sh
@@ -1,11 +1,13 @@
 ## Cleanup test objects
-gvm uninstall tip > /dev/null 2>&1
+gvm uninstall go1.4 > /dev/null 2>&1
+gvm uninstall master > /dev/null 2>&1
 gvm uninstall go1.1.1 > /dev/null 2>&1
 gvm uninstall go1.2.2 > /dev/null 2>&1
 #######################
 
-gvm install tip #status=0
-gvm list #status=0; match=/tip/
+gvm install go1.4 #status=0
+GOROOT_BOOTSTRAP=$GVM_ROOT/gos/go1.4 gvm install master #status=0
+gvm list #status=0; match=/master/
 gvm install go1.1.1 #status=0
 gvm list #status=0; match=/go1.1.1/
 gvm install go1.2.2   #status=0