diff --git a/tests/gvm_alias_comment_test.sh b/tests/gvm_alias_comment_test.sh
new file mode 100644
index 0000000..7c7815b
--- /dev/null
+++ b/tests/gvm_alias_comment_test.sh
@@ -0,0 +1,19 @@
+source $GVM_ROOT/scripts/gvm
+
+## Cleanup test objects
+gvm alias delete foo
+gvm alias delete bar
+#######################
+
+gvm alias # status=0
+gvm alias create foo go1.2 # status=0
+gvm alias create bar go1.0.3 # status=0
+gvm alias list # status=0; match=/gvm go aliases/; match=/foo \(go1\.2\)/; match=/bar \(go1\.0\.3\)/
+gvm use foo # status=0
+go version # status=0; match=/go1\.2/
+gvm use bar # status=0
+go version # status=0; match=/go1\.0\.3/
+gvm alias delete foo
+gvm alias list # status=0; match=/gvm go aliases/; match!=/foo \(go1\.2\)/; match=/bar \(go1\.0\.3\)/
+gvm alias delete bar
+gvm alias list # status=0; match=/gvm go aliases/; match!=/foo \(go1\.2\)/; match!=/bar \(go1\.0\.3\)/
diff --git a/tests/gvm_comment_test.sh b/tests/gvm_comment_test.sh
new file mode 100644
index 0000000..58ad4e6
--- /dev/null
+++ b/tests/gvm_comment_test.sh
@@ -0,0 +1 @@
+gvm # status=0; match=/GVM is the Go Version Manager/