diff --git a/test/testhotplug.c b/test/testhotplug.c
index f050adea51..65c1a4a432 100644
--- a/test/testhotplug.c
+++ b/test/testhotplug.c
@@ -96,6 +96,11 @@ int main(int argc, char *argv[])
             case SDL_EVENT_QUIT:
                 keepGoing = false;
                 break;
+            case SDL_EVENT_KEY_DOWN:
+                if (event.key.scancode == SDL_SCANCODE_ESCAPE) {
+                    keepGoing = false;
+                }
+                break;
             case SDL_EVENT_KEYBOARD_ADDED:
                 SDL_Log("Keyboard '%s' added  : %" SDL_PRIu32, SDL_GetKeyboardNameForID(event.kdevice.which), event.kdevice.which);
                 break;
diff --git a/test/testmouse.c b/test/testmouse.c
index 05e15eacf5..3cf5e97036 100644
--- a/test/testmouse.c
+++ b/test/testmouse.c
@@ -213,6 +213,10 @@ static void loop(void *arg)
             break;
 
         case SDL_EVENT_KEY_DOWN:
+            if (event.key.scancode == SDL_SCANCODE_ESCAPE) {
+                loop_data->done = true;
+                break;
+            }
             if (event.key.key == SDLK_C) {
                 int x, y, w, h;
                 SDL_GetWindowPosition(window, &x, &y);