diff --git a/test/testgamecontroller.c b/test/testgamecontroller.c
index cf5eaf734..7f3af1e29 100644
--- a/test/testgamecontroller.c
+++ b/test/testgamecontroller.c
@@ -448,6 +448,10 @@ main(int argc, char *argv[])
     /* !!! FIXME: */
     /*SDL_RenderSetLogicalSize(screen, background->w, background->h);*/
 
+    if (argv[1] && *argv[1] != '-') {
+        gamecontroller = SDL_GameControllerOpen(SDL_atoi(argv[1]));
+    }
+
     UpdateWindowTitle();
 
     /* Loop, getting controller events! */