diff --git a/src/tests/eina/eina_test_vpath.c b/src/tests/eina/eina_test_vpath.c
--- a/src/tests/eina/eina_test_vpath.c
+++ b/src/tests/eina/eina_test_vpath.c
@@ -21,8 +21,8 @@
 
    snprintf(test, sizeof(test), "%s/bla", eina_environment_home_get());
    ck_assert_str_eq(eina_vpath_resolve("(:home:)/bla"), test);
+   ck_assert_str_eq(eina_vpath_resolve("${home}/bla"), test);
    ck_assert_str_eq(eina_vpath_resolve("/test/for/the/last/case"), "/test/for/the/last/case");
-
 }
 EFL_END_TEST
 
@@ -33,6 +33,13 @@
    ck_assert_ptr_eq(eina_vpath_resolve("(:"), NULL);
    ck_assert_ptr_eq(eina_vpath_resolve("(:home:)"), NULL);
    ck_assert_ptr_eq(eina_vpath_resolve("(:wrong_meta_key:)/"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${asdfasdfafasdf"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${missing_slash}"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${home}"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${wrong_meta_key}/"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${home:)"), NULL);
+   ck_assert_ptr_eq(eina_vpath_resolve("${wrong_meta_key:)/"), NULL);
 }
 EFL_END_TEST
 
@@ -47,6 +54,10 @@
    eina_vpath_resolve_snprintf(buf, sizeof(buf), "(:home:)/%s/%d/", string, x);
    snprintf(cmp, sizeof(cmp), "%s/%s/%d/", eina_environment_home_get(), string, x);
    ck_assert_str_eq(buf, cmp);
+
+   eina_vpath_resolve_snprintf(buf, sizeof(buf), "${home}/%s/%d/", string, x);
+   snprintf(cmp, sizeof(cmp), "%s/%s/%d/", eina_environment_home_get(), string, x);
+   ck_assert_str_eq(buf, cmp);
 }
 EFL_END_TEST