diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index fc477e8351..d3b3bcbb92 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2391,6 +2391,7 @@ endif
 
 EXTRA_DIST2 += \
 tests/evas/TestFont.eet \
+tests/evas/fonts/evas_test_font.ttf \
 tests/evas/images/HM7Y9233-50.tgv \
 tests/evas/images/HM7Y9233.jpg \
 tests/evas/images/Light-50.png \
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index f6d4ccd77a..07e2928092 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -18,7 +18,7 @@
 #include "evas_suite.h"
 
 #define TEST_FONT_NAME "DejaVuSans,UnDotum"
-#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet"
+#define TEST_FONT_SOURCE TESTS_SRC_DIR "/fonts/TestFont.eet"
 #define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas"
 
 #define START_FILTER_TEST() \
diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c
index 35d665e847..1f160444e4 100644
--- a/src/tests/evas/evas_test_mask.c
+++ b/src/tests/evas/evas_test_mask.c
@@ -11,7 +11,7 @@
 #include "evas_tests_helpers.h"
 
 #define TEST_FONT_NAME "DejaVuSans,UnDotum"
-#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet"
+#define TEST_FONT_SOURCE TESTS_SRC_DIR "/fonts/TestFont.eet"
 
 #define START_MASK_TEST(w, h) \
    Ecore_Evas *ee; Evas *e; \
diff --git a/src/tests/evas/evas_test_object_smart.c b/src/tests/evas/evas_test_object_smart.c
index 23a43b7ac3..dbf88e0a7a 100644
--- a/src/tests/evas/evas_test_object_smart.c
+++ b/src/tests/evas/evas_test_object_smart.c
@@ -15,7 +15,7 @@
 #include "evas_suite.h"
 #include "evas_tests_helpers.h"
 
-#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet"
+#define TEST_FONT_SOURCE TESTS_SRC_DIR "/fonts/TestFont.eet"
 #define TEST_TEXTBLOCK_FONT "font=DejaVuSans font_source=" TEST_FONT_SOURCE
 #define TEST_TEXTBLOCK_FONT_SIZE "14"
 #define TEST_TEXT_FONT "DejaVuSans,UnDotum"
diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c
index 951e4c2039..f8508ec289 100644
--- a/src/tests/evas/evas_test_text.c
+++ b/src/tests/evas/evas_test_text.c
@@ -11,8 +11,10 @@
 #include "evas_suite.h"
 #include "evas_tests_helpers.h"
 
+#define TEST_FONT_DIR TESTS_SRC_DIR "/fonts/"
 #define TEST_FONT_NAME "DejaVuSans,UnDotum"
-#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet"
+#define TEST_FONT_SOURCE TEST_FONT_DIR "TestFont.eet"
+#define TEST_FONT_TTF_NAME "Evas Test Font"
 
 #define START_TEXT_TEST() \
    Evas *evas; \
@@ -654,6 +656,32 @@ START_TEST(evas_text_render)
 }
 END_TEST
 
+START_TEST(evas_text_font_load)
+{
+   Ecore_Evas *ee = ecore_evas_buffer_new(500, 500);
+   Evas *evas = ecore_evas_get(ee);
+   const char *font, *match;
+   Eina_List *list, *li;
+   int found = 0;
+
+   evas_font_path_global_append(TEST_FONT_DIR);
+   match = eina_stringshare_printf("%s:style=Regular", TEST_FONT_TTF_NAME);
+   list = evas_font_available_list(evas);
+   EINA_LIST_FOREACH(list, li, font)
+     if (eina_streq(font, match))
+       {
+          found = 1;
+          break;
+       }
+   evas_font_available_list_free(evas, list);
+   eina_stringshare_del(match);
+
+   ck_assert_int_eq(found, 1);
+
+   ecore_evas_free(ee);
+}
+END_TEST
+
 void evas_test_text(TCase *tc)
 {
    tcase_add_test(tc, evas_text_simple);
@@ -668,4 +696,5 @@ void evas_test_text(TCase *tc)
 
    tcase_add_test(tc, evas_text_unrelated);
    tcase_add_test(tc, evas_text_render);
+   tcase_add_test(tc, evas_text_font_load);
 }
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 196ef2fb2a..827cda8569 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -23,7 +23,7 @@ EAPI int
 _evas_textblock_format_offset_get(const Evas_Object_Textblock_Node_Format *n);
 /* end of functions defined in evas_object_textblock.c */
 
-#define TEST_FONT "font=DejaVuSans,UnDotum,malayalam font_source=" TESTS_SRC_DIR "/TestFont.eet"
+#define TEST_FONT "font=DejaVuSans,UnDotum,malayalam font_source=" TESTS_SRC_DIR "/fonts/TestFont.eet"
 
 static const char *style_buf =
    "DEFAULT='" TEST_FONT " font_size=10 color=#000 text_class=entry'"
diff --git a/src/tests/evas/TestFont.eet b/src/tests/evas/fonts/TestFont.eet
similarity index 100%
rename from src/tests/evas/TestFont.eet
rename to src/tests/evas/fonts/TestFont.eet
diff --git a/src/tests/evas/fonts/evas_test_font.ttf b/src/tests/evas/fonts/evas_test_font.ttf
new file mode 100644
index 0000000000..5409502de0
Binary files /dev/null and b/src/tests/evas/fonts/evas_test_font.ttf differ