diff --git a/test/testalpha.c b/test/testalpha.c
index 4e2f41c7f..0bdb7725c 100644
--- a/test/testalpha.c
+++ b/test/testalpha.c
@@ -505,7 +505,10 @@ fprintf(stderr, "Slept %d ticks\n", (SDL_GetTicks()-ticks));
 					}
 					break;
 				case SDL_KEYDOWN:
-					/* Any keypress quits the app... */
+					if ( event.key.keysym.sym == SDLK_ESCAPE ) {
+						done = 1;
+					}
+					break;
 				case SDL_QUIT:
 					done = 1;
 					break;
diff --git a/test/testwm.c b/test/testwm.c
index 20d88fe80..5eec9c85e 100644
--- a/test/testwm.c
+++ b/test/testwm.c
@@ -180,10 +180,10 @@ int SDLCALL FilterEvents(const SDL_Event *event)
 				event->active.gain ? "gained" : "lost");
 			if ( event->active.state & SDL_APPACTIVE )
 				printf("active ");
-			if ( event->active.state & SDL_APPMOUSEFOCUS )
-				printf("mouse ");
 			if ( event->active.state & SDL_APPINPUTFOCUS )
 				printf("input ");
+			if ( event->active.state & SDL_APPMOUSEFOCUS )
+				printf("mouse ");
 			printf("focus\n");
 
 			/* See if we are iconified or restored */