diff --git a/test/virtualenvs.bats b/test/virtualenvs.bats
index 9079efb..51bc44d 100644
--- a/test/virtualenvs.bats
+++ b/test/virtualenvs.bats
@@ -4,10 +4,15 @@ load test_helper
 
 setup() {
   export PYENV_ROOT="${TMP}/pyenv"
-  mkdir -p "${PYENV_ROOT}/versions/2.7.6"
-  mkdir -p "${PYENV_ROOT}/versions/3.3.3"
-  mkdir -p "${PYENV_ROOT}/versions/venv27"
-  mkdir -p "${PYENV_ROOT}/versions/venv33"
+  mkdir -p "${PYENV_ROOT}/versions/2.7.6/envs/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/3.3.3/envs/venv33"
+  ln -s "venv27" "${PYENV_ROOT}/versions/venv27"
+  ln -s "venv33" "${PYENV_ROOT}/versions/venv33"
+}
+
+create_alias() {
+  mkdir -p "${PYENV_ROOT}/versions"
+  ln -s "$2" "${PYENV_ROOT}/versions/$1"
 }
 
 @test "list virtual environments only" {
@@ -21,40 +26,40 @@ setup() {
 
   assert_success
   assert_output <<OUT
-  venv27 (created from ${PYENV_ROOT}/versions/2.7.6)
-  venv33 (created from ${PYENV_ROOT}/versions/3.3.3)
+  2.7.6/envs/venv27
+  3.3.3/envs/venv33
 OUT
 
-  unstub pyenv-version-name
-  unstub pyenv-virtualenv-prefix
+  # unstub pyenv-version-name
+  # unstub pyenv-virtualenv-prefix
 }
 
 @test "list virtual environments with hit prefix" {
   stub pyenv-version-name ": echo venv33"
   stub pyenv-virtualenv-prefix "2.7.6 : false"
   stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
-  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
+  stub pyenv-virtualenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-virtualenvs
 
   assert_success
   assert_output <<OUT
-  venv27 (created from /usr)
-* venv33 (created from /usr)
+  2.7.6/envs/venv27
+* 3.3.3/envs/venv33
 OUT
 
-  unstub pyenv-version-name
-  unstub pyenv-virtualenv-prefix
+  # unstub pyenv-version-name
+  # unstub pyenv-virtualenv-prefix
 }
 
 @test "list virtual environments with --bare" {
   stub pyenv-virtualenv-prefix "2.7.6 : false"
   stub pyenv-virtualenv-prefix "3.3.3 : false"
-  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
-  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
+  stub pyenv-virtualenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
-  run pyenv-virtualenvs --bare
+  run pyenv-virtualenvs --bare --only-aliases
 
   assert_success
   assert_output <<OUT