diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c
index 21cb1be5d5..4296096556 100644
--- a/legacy/elementary/src/bin/test.c
+++ b/legacy/elementary/src/bin/test.c
@@ -12,6 +12,7 @@ void test_button(void *data, Evas_Object *obj, void *event_info);
 void test_fileselector_button(void *data, Evas_Object *obj, void *event_info);
 void test_toggle(void *data, Evas_Object *obj, void *event_info);
 void test_clock(void *data, Evas_Object *obj, void *event_info);
+void test_clock2(void *data, Evas_Object *obj, void *event_info);
 void test_check(void *data, Evas_Object *obj, void *event_info);
 void test_radio(void *data, Evas_Object *obj, void *event_info);
 void test_layout(void *data, Evas_Object *obj, void *event_info);
@@ -214,6 +215,7 @@ my_win_main(char *autorun)
    ADD_TEST("Toggles", test_toggle);
    ADD_TEST("Table", test_table);
    ADD_TEST("Clock", test_clock);
+   ADD_TEST("Clock 2", test_clock2);
    ADD_TEST("Layout", test_layout);
    ADD_TEST("Hover", test_hover);
    ADD_TEST("Hover 2", test_hover2);
diff --git a/legacy/elementary/src/bin/test_clock.c b/legacy/elementary/src/bin/test_clock.c
index 0f01d3be2c..937c8dac52 100644
--- a/legacy/elementary/src/bin/test_clock.c
+++ b/legacy/elementary/src/bin/test_clock.c
@@ -40,6 +40,13 @@ test_clock(void *data, Evas_Object *obj, void *event_info)
    elm_box_pack_end(bx, ck);
    evas_object_show(ck);
 
+   ck = elm_clock_add(win);
+   elm_clock_show_seconds_set(ck, 1);
+   elm_clock_show_am_pm_set(ck, 0);
+   elm_clock_time_set(ck, 23, 59, 57);
+   elm_box_pack_end(bx, ck);
+   evas_object_show(ck);
+
    ck = elm_clock_add(win);
    elm_clock_edit_set(ck, 1);
    elm_clock_show_seconds_set(ck, 1);
@@ -58,4 +65,79 @@ test_clock(void *data, Evas_Object *obj, void *event_info)
 
    evas_object_show(win);
 }
+
+static void
+_edit_bt_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *ck = data;
+
+   if (!elm_clock_edit_get(ck)) {
+	elm_button_label_set(obj, "Done");
+	elm_clock_edit_set(ck, 1);
+	return;
+   }
+   elm_button_label_set(obj, "Edit");
+   elm_clock_edit_set(ck, 0);
+}
+
+static void
+_hmode_bt_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *ck = data;
+
+   if (!elm_clock_show_am_pm_get(ck)) {
+	elm_button_label_set(obj, "24h");
+	elm_clock_show_am_pm_set(ck, 1);
+	return;
+   }
+   elm_button_label_set(obj, "12h");
+   elm_clock_show_am_pm_set(ck, 0);
+}
+
+void
+test_clock2(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *bx, *hbx, *ck, *bt;
+
+   win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Clock 2");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+
+   ck = elm_clock_add(win);
+   elm_clock_show_seconds_set(ck, 1);
+   elm_clock_show_am_pm_set(ck, 1);
+   elm_box_pack_end(bx, ck);
+   evas_object_show(ck);
+
+   hbx = elm_box_add(win);
+   evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_box_horizontal_set(hbx, EINA_TRUE);
+   elm_box_pack_end(bx, hbx);
+   evas_object_show(hbx);
+
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Edit");
+   evas_object_smart_callback_add(bt, "clicked", _edit_bt_clicked, ck);
+   elm_box_pack_end(hbx, bt);
+   evas_object_show(bt);
+
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "24h");
+   evas_object_smart_callback_add(bt, "clicked", _hmode_bt_clicked, ck);
+   elm_box_pack_end(hbx, bt);
+   evas_object_show(bt);
+
+   evas_object_show(win);
+}
+
 #endif