diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index 517ace64a2..cf5329cc25 100644
--- a/src/tests/elementary/elm_test_icon.c
+++ b/src/tests/elementary/elm_test_icon.c
@@ -41,8 +41,34 @@ EFL_START_TEST(elm_atspi_role_get)
 }
 EFL_END_TEST
 
+EFL_START_TEST(elm_test_icon_set)
+{
+   Evas_Object *win, *image;
+   Eina_Bool ok;
+   const char *icon_name;
+
+   win = win_add(NULL, "icon", ELM_WIN_BASIC);
+
+   image = elm_icon_add(win);
+   evas_object_show(image);
+
+   ok = elm_icon_standard_set(image, "folder");
+   ck_assert(ok);
+   icon_name = elm_icon_standard_get(image);
+   ck_assert_str_eq(icon_name, "folder");
+
+   ok = elm_icon_standard_set(image, "None");
+   ck_assert(ok == 0);
+   icon_name = elm_icon_standard_get(image);
+   /* elm_icon only changes internal name on success */
+   ck_assert_str_eq(icon_name, "folder");
+
+}
+EFL_END_TEST
+
 void elm_test_icon(TCase *tc)
 {
    tcase_add_test(tc, elm_icon_legacy_type_check);
    tcase_add_test(tc, elm_atspi_role_get);
+   tcase_add_test(tc, elm_test_icon_set);
 }
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 6d6ff52f6f..36e9aa2a84 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -227,30 +227,6 @@ EFL_START_TEST(elm_image_evas_image_get)
 }
 EFL_END_TEST
 
-EFL_START_TEST(efl_ui_image_icon)
-{
-   Evas_Object *win, *image;
-   Eina_Bool ok;
-   const char *icon_name;
-
-   win = win_add(NULL, "image", ELM_WIN_BASIC);
-
-   image = efl_add(EFL_UI_IMAGE_CLASS, win);
-   evas_object_show(image);
-
-   ok = efl_ui_image_icon_set(image, "folder");
-   ck_assert(ok);
-   icon_name = efl_ui_image_icon_get(image);
-   ck_assert_str_eq(icon_name, "folder");
-
-   ok = efl_ui_image_icon_set(image, "None");
-   ck_assert(ok == 0);
-   icon_name = efl_ui_image_icon_get(image);
-   ck_assert(icon_name == NULL);
-
-}
-EFL_END_TEST
-
 void elm_test_image(TCase *tc)
 {
    tcase_add_test(tc, elm_image_legacy_type_check);
@@ -259,5 +235,4 @@ void elm_test_image(TCase *tc)
    tcase_add_test(tc, elm_image_async_mmap);
    tcase_add_test(tc, elm_image_evas_object_color_set);
    tcase_add_test(tc, elm_image_evas_image_get);
-   tcase_add_test(tc, efl_ui_image_icon);
 }