diff --git a/legacy/ephysics/data/themes/frame.edc b/legacy/ephysics/data/themes/frame.edc
index 18a0b51a2e..b1bca70eea 100644
--- a/legacy/ephysics/data/themes/frame.edc
+++ b/legacy/ephysics/data/themes/frame.edc
@@ -133,6 +133,17 @@
             }
          }
 
+         part {
+            name: "extra_input";
+            type: SWALLOW;
+            mouse_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1.relative: 0.2 0.0;
+               rel2.relative: 0.8 0.1;
+            }
+         }
+
       }
 
       programs {
diff --git a/legacy/ephysics/src/bin/Makefile.am b/legacy/ephysics/src/bin/Makefile.am
index c374067d65..91e970169f 100644
--- a/legacy/ephysics/src/bin/Makefile.am
+++ b/legacy/ephysics/src/bin/Makefile.am
@@ -20,6 +20,7 @@ test_bouncing_ball.c \
 test_bouncing_text.c \
 test_colliding_balls.c \
 test_collision_detection.c \
+test_collision_speed.c \
 test_constraint.c \
 test_falling_letters.c \
 test_jumping_balls.c \
diff --git a/legacy/ephysics/src/bin/test.c b/legacy/ephysics/src/bin/test.c
index 94e9f88140..1676656d2f 100644
--- a/legacy/ephysics/src/bin/test.c
+++ b/legacy/ephysics/src/bin/test.c
@@ -13,6 +13,7 @@ void test_bouncing_ball(void *data, Evas_Object *obj, void *event_info);
 void test_bouncing_text(void *data, Evas_Object *obj, void *event_info);
 void test_colliding_balls(void *data, Evas_Object *obj, void *event_info);
 void test_collision(void *data, Evas_Object *obj, void *event_info);
+void test_collision_speed(void *data, Evas_Object *obj, void *event_info);
 void test_constraint(void *data, Evas_Object *obj, void *event_info);
 void test_falling_letters(void *data, Evas_Object *obj, void *event_info);
 void test_jumping_balls(void *data, Evas_Object *obj, void *event_info);
@@ -150,6 +151,7 @@ _main_win_add(char *autorun __UNUSED__, Eina_Bool test_win_only __UNUSED__)
    ADD_TEST("BOUNCING TEXT", test_bouncing_text);
    ADD_TEST("COLLIDING BALLS", test_colliding_balls);
    ADD_TEST("COLLISION DETECTION", test_collision);
+   ADD_TEST("COLLISION HIGH SPEED", test_collision_speed);
    ADD_TEST("CONSTRAINT", test_constraint);
    ADD_TEST("FALLING LETTERS", test_falling_letters);
    ADD_TEST("JUMPING BALLS", test_jumping_balls);
diff --git a/legacy/ephysics/src/bin/test_collision_speed.c b/legacy/ephysics/src/bin/test_collision_speed.c
new file mode 100644
index 0000000000..17a1fde135
--- /dev/null
+++ b/legacy/ephysics/src/bin/test_collision_speed.c
@@ -0,0 +1,144 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "ephysics_test.h"
+
+typedef struct _Speed_Data Speed_Data;
+
+struct _Speed_Data {
+     Test_Data base;
+     Evas_Object *bt;
+     Evas_Object *sp;
+     EPhysics_Body *ball;
+};
+
+static void
+_shoot(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Speed_Data *speed_data = data;
+   double impulse;
+
+   elm_object_disabled_set(obj, EINA_TRUE);
+   impulse = elm_spinner_value_get(speed_data->sp);
+   ephysics_body_central_impulse_apply(speed_data->ball, impulse, 0);
+}
+
+static void
+_world_populate(Speed_Data *speed_data)
+{
+   Evas_Object *sphere, *shadow;
+   EPhysics_Body *ball;
+
+   shadow = elm_layout_add(speed_data->base.win);
+   elm_layout_file_set(
+      shadow, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "shadow-ball");
+   evas_object_move(shadow, 80, FLOOR_Y);
+   evas_object_resize(shadow, 54, 3);
+   evas_object_show(shadow);
+   speed_data->base.evas_objs = eina_list_append(speed_data->base.evas_objs,
+                                                 shadow);
+
+   sphere = elm_image_add(speed_data->base.win);
+   elm_image_file_set(
+      sphere, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "red-ball");
+   evas_object_move(sphere, 80, FLOOR_Y - 54);
+   evas_object_resize(sphere, 54, 54);
+   evas_object_show(sphere);
+   speed_data->base.evas_objs = eina_list_append(speed_data->base.evas_objs,
+                                                 sphere);
+
+   ball = ephysics_body_circle_add(speed_data->base.world);
+   ephysics_body_evas_object_set(ball, sphere, EINA_TRUE);
+   ephysics_body_restitution_set(ball, 0.8);
+   ephysics_body_friction_set(ball, 0.2);
+   ephysics_body_event_callback_add(ball, EPHYSICS_CALLBACK_BODY_UPDATE,
+                                    update_object_cb, shadow);
+   speed_data->base.bodies = eina_list_append(speed_data->base.bodies, ball);
+   speed_data->ball = ball;
+}
+
+static void
+_restart(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Speed_Data *speed_data = data;
+
+   DBG("Restart pressed");
+   test_clean((Test_Data *) speed_data);
+   _world_populate(speed_data);
+   elm_object_disabled_set(speed_data->bt, EINA_FALSE);
+}
+
+static void
+_win_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Speed_Data *speed_data = data;
+
+   test_clean((Test_Data *)speed_data);
+   evas_object_del(speed_data->base.layout);
+   ephysics_world_del(speed_data->base.world);
+   free(speed_data);
+   ephysics_shutdown();
+}
+
+void
+test_collision_speed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   EPhysics_Body *boundary;
+   EPhysics_World *world;
+   Speed_Data *speed_data;
+   Evas_Object *bt, *sp;
+
+   if (!ephysics_init())
+     return;
+
+   speed_data = calloc(1, sizeof(Speed_Data));
+   if (!speed_data)
+     {
+        ERR("Failed to create test data");
+        ephysics_shutdown();
+        return;
+     }
+
+   test_win_add((Test_Data *) speed_data, "Collision with High Speed",
+                EINA_FALSE);
+   evas_object_smart_callback_add(speed_data->base.win,
+                                  "delete,request", _win_del, speed_data);
+
+   elm_layout_signal_callback_add(speed_data->base.layout, "restart",
+                                  "test-theme", _restart, speed_data);
+
+   bt = elm_button_add(speed_data->base.win);
+   elm_object_style_set(bt, "ephysics-test-shoot");
+   elm_layout_content_set(speed_data->base.layout, "extra_button", bt);
+   evas_object_smart_callback_add(bt, "clicked", _shoot, speed_data);
+   speed_data->bt = bt;
+
+   sp = elm_spinner_add(speed_data->base.win);
+   elm_spinner_min_max_set(sp, 0, 500);
+   elm_spinner_step_set(sp, 5);
+   elm_spinner_value_set(sp, 100);
+   elm_object_style_set(sp, "ephysics-test");
+   elm_layout_content_set(speed_data->base.layout, "extra_input", sp);
+   speed_data->sp = sp;
+
+   world = ephysics_world_new();
+   ephysics_world_render_geometry_set(world, 50, 40, WIDTH - 100, FLOOR_Y - 40);
+   speed_data->base.world = world;
+
+   boundary = ephysics_body_bottom_boundary_add(world);
+   ephysics_body_restitution_set(boundary, 0.65);
+   ephysics_body_friction_set(boundary, 4);
+
+   boundary = ephysics_body_right_boundary_add(world);
+   ephysics_body_restitution_set(boundary, 0.4);
+   ephysics_body_friction_set(boundary, 3);
+
+   boundary = ephysics_body_left_boundary_add(world);
+   ephysics_body_restitution_set(boundary, 0.4);
+   ephysics_body_friction_set(boundary, 3);
+
+   ephysics_body_top_boundary_add(world);
+
+   _world_populate(speed_data);
+}
diff --git a/legacy/ephysics/src/bin/test_velocity.c b/legacy/ephysics/src/bin/test_velocity.c
index e7018bc841..cd37ae1c7c 100644
--- a/legacy/ephysics/src/bin/test_velocity.c
+++ b/legacy/ephysics/src/bin/test_velocity.c
@@ -106,7 +106,7 @@ test_velocity(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
      return;
 
    test_data = test_data_new();
-   test_win_add(test_data, "Bouncing Ball", EINA_TRUE);
+   test_win_add(test_data, "Velocity Getters", EINA_TRUE);
 
    edje = elm_layout_edje_get(test_data->layout);
    edje_object_signal_callback_add(edje, "restart", "test-theme", _restart,