diff --git a/test/testjoystick.c b/test/testjoystick.c
index c406bdc91..648e85fae 100644
--- a/test/testjoystick.c
+++ b/test/testjoystick.c
@@ -158,8 +158,19 @@ int main(int argc, char *argv[])
 	/* Print information about the joysticks */
 	printf("There are %d joysticks attached\n", SDL_NumJoysticks());
 	for ( i=0; i<SDL_NumJoysticks(); ++i ) {
+		SDL_Joystick *stick = NULL;
 		name = SDL_JoystickName(i);
 		printf("Joystick %d: %s\n",i,name ? name : "Unknown Joystick");
+		stick = SDL_JoystickOpen(i);
+		if (stick == NULL) {
+			fprintf(stderr, "SDL_JoystickOpen(%d) failed: %s\n", i, SDL_GetError());
+		} else {
+			printf("       axes: %d\n", SDL_JoystickNumAxes(stick));
+			printf("      balls: %d\n", SDL_JoystickNumBalls(stick));
+			printf("       hats: %d\n", SDL_JoystickNumHats(stick));
+			printf("    buttons: %d\n", SDL_JoystickNumButtons(stick));
+			SDL_JoystickClose(stick);
+		}
 	}
 
 	if ( argv[1] ) {