diff --git a/test/controllermap.c b/test/controllermap.c
index 258e336e2..4642e5931 100644
--- a/test/controllermap.c
+++ b/test/controllermap.c
@@ -708,6 +708,8 @@ main(int argc, char *argv[])
     int i;
     SDL_Joystick *joystick;
 
+    SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+
     /* Enable standard application logging */
     SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
 
diff --git a/test/testgamecontroller.c b/test/testgamecontroller.c
index 391067587..0394e5c50 100644
--- a/test/testgamecontroller.c
+++ b/test/testgamecontroller.c
@@ -228,6 +228,8 @@ main(int argc, char *argv[])
     int nController = 0;
     char guid[64];
 
+    SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+
     /* Enable standard application logging */
     SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);