diff --git a/test/testMergeShapes.cpp b/test/testMergeShapes.cpp
index 3242df7b..549ea9ef 100644
--- a/test/testMergeShapes.cpp
+++ b/test/testMergeShapes.cpp
@@ -38,6 +38,12 @@ void tvgtest()
     tvg::Engine::term();
 }
 
+void
+win_del(void *data, Evas_Object *o, void *ev)
+{
+   elm_exit();
+}
+
 
 int main(int argc, char **argv)
 {
@@ -47,6 +53,7 @@ int main(int argc, char **argv)
     elm_init(argc, argv);
 
     Eo* win = elm_win_util_standard_add(NULL, "TizenVG Test");
+    evas_object_smart_callback_add(win, "delete,request", win_del, 0);
 
     Eo* img = evas_object_image_filled_add(evas_object_evas_get(win));
     evas_object_image_size_set(img, WIDTH, HEIGHT);
diff --git a/test/testMultiShapes.cpp b/test/testMultiShapes.cpp
index a73d2b6d..94d3c31f 100644
--- a/test/testMultiShapes.cpp
+++ b/test/testMultiShapes.cpp
@@ -43,6 +43,12 @@ void tvgtest()
     tvg::Engine::term();
 }
 
+void
+win_del(void *data, Evas_Object *o, void *ev)
+{
+   elm_exit();
+}
+
 int main(int argc, char **argv)
 {
     tvgtest();
@@ -51,6 +57,7 @@ int main(int argc, char **argv)
     elm_init(argc, argv);
 
     Eo* win = elm_win_util_standard_add(NULL, "TizenVG Test");
+    evas_object_smart_callback_add(win, "delete,request", win_del, 0);
 
     Eo* img = evas_object_image_filled_add(evas_object_evas_get(win));
     evas_object_image_size_set(img, WIDTH, HEIGHT);
diff --git a/test/testShape.cpp b/test/testShape.cpp
index 7d0aa88d..c806d990 100644
--- a/test/testShape.cpp
+++ b/test/testShape.cpp
@@ -34,6 +34,11 @@ void tvgtest()
     tvg::Engine::term();
 }
 
+void
+win_del(void *data, Evas_Object *o, void *ev)
+{
+   elm_exit();
+}
 
 int main(int argc, char **argv)
 {
@@ -43,6 +48,7 @@ int main(int argc, char **argv)
     elm_init(argc, argv);
 
     Eo* win = elm_win_util_standard_add(NULL, "TizenVG Test");
+    evas_object_smart_callback_add(win, "delete,request", win_del, 0);
 
     Eo* img = evas_object_image_filled_add(evas_object_evas_get(win));
     evas_object_image_size_set(img, WIDTH, HEIGHT);