diff --git a/test/testautomation_audio.c b/test/testautomation_audio.c
index a505efda73..5459243d0a 100644
--- a/test/testautomation_audio.c
+++ b/test/testautomation_audio.c
@@ -108,7 +108,7 @@ static int audio_initQuitAudio(void *arg)
         }
 
         /* Call Init */
-        SDL_SetHint("SDL_AUDIO_DRIVER", audioDriver);
+        SDL_SetHint(SDL_HINT_AUDIO_DRIVER, audioDriver);
         result = SDL_InitSubSystem(SDL_INIT_AUDIO);
         SDLTest_AssertPass("Call to SDL_InitSubSystem(SDL_INIT_AUDIO) with driver='%s'", audioDriver);
         SDLTest_AssertCheck(result == 0, "Validate result value; expected: 0 got: %d", result);
@@ -122,7 +122,7 @@ static int audio_initQuitAudio(void *arg)
     audioDriver = NULL;
 
     /* Call Init */
-    SDL_SetHint("SDL_AUDIO_DRIVER", audioDriver);
+    SDL_SetHint(SDL_HINT_AUDIO_DRIVER, audioDriver);
     result = SDL_InitSubSystem(SDL_INIT_AUDIO);
     SDLTest_AssertPass("Call to SDL_AudioInit(NULL)");
     SDLTest_AssertCheck(result == 0, "Validate result value; expected: 0 got: %d", result);
@@ -175,7 +175,7 @@ static int audio_initOpenCloseQuitAudio(void *arg)
         for (j = 0; j < 2; j++) {
 
             /* Call Init */
-            SDL_SetHint("SDL_AUDIO_DRIVER", audioDriver);
+            SDL_SetHint(SDL_HINT_AUDIO_DRIVER, audioDriver);
             result = SDL_InitSubSystem(SDL_INIT_AUDIO);
             SDLTest_AssertPass("Call to SDL_InitSubSystem(SDL_INIT_AUDIO) with driver='%s'", audioDriver);
             SDLTest_AssertCheck(result == 0, "Validate result value; expected: 0 got: %d", result);
@@ -266,7 +266,7 @@ static int audio_pauseUnpauseAudio(void *arg)
         for (j = 0; j < 2; j++) {
 
             /* Call Init */
-            SDL_SetHint("SDL_AUDIO_DRIVER", audioDriver);
+            SDL_SetHint(SDL_HINT_AUDIO_DRIVER, audioDriver);
             result = SDL_InitSubSystem(SDL_INIT_AUDIO);
             SDLTest_AssertPass("Call to SDL_InitSubSystem(SDL_INIT_AUDIO) with driver='%s'", audioDriver);
             SDLTest_AssertCheck(result == 0, "Validate result value; expected: 0 got: %d", result);
diff --git a/test/testoffscreen.c b/test/testoffscreen.c
index 613fa1fab9..8b03228fca 100644
--- a/test/testoffscreen.c
+++ b/test/testoffscreen.c
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
     }
 
     /* Force the offscreen renderer, if it cannot be created then fail out */
-    SDL_SetHint("SDL_VIDEO_DRIVER", "offscreen");
+    SDL_SetHint(SDL_HINT_VIDEO_DRIVER, "offscreen");
     if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) {
         SDL_Log("Couldn't initialize the offscreen video driver: %s\n",
                 SDL_GetError());