diff --git a/test/testlock.c b/test/testlock.c
index a0189e4b2..8c2ca5e89 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -69,7 +69,7 @@ static void closemutex(int sig)
 }
 
 static int SDLCALL
-DoWork(void *data)
+Run(void *data)
 {
     if (SDL_ThreadID() == mainthread) {
         (void)signal(SIGTERM, closemutex);
@@ -195,7 +195,7 @@ int main(int argc, char *argv[])
     for (i = 0; i < nb_threads; ++i) {
         char name[64];
         (void)SDL_snprintf(name, sizeof(name), "Worker%d", i);
-        threads[i] = SDL_CreateThread(DoWork, name, &threads[i]);
+        threads[i] = SDL_CreateThread(Run, name, NULL);
         if (threads[i] == NULL) {
             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread!\n");
         }
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
 #endif
 
     (void)signal(SIGINT, terminate);
-    DoWork(NULL);
+    Run(NULL);
 
     return 0; /* Never reached */
 }
diff --git a/test/testthread.c b/test/testthread.c
index 4e9f22fa0..15297e320 100644
--- a/test/testthread.c
+++ b/test/testthread.c
@@ -17,15 +17,18 @@
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
+#include <SDL3/SDL_test.h>
 
 static SDL_TLSID tls;
 static int alive = 0;
 static int testprio = 0;
+SDLTest_CommonState *state;
 
 /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
 static void
 quit(int rc)
 {
+    SDLTest_CommonDestroyState(state);
     SDL_Quit();
     exit(rc);
 }
@@ -82,12 +85,38 @@ killed(int sig)
 
 int main(int argc, char *argv[])
 {
-    int arg = 1;
+    int i;
     SDL_Thread *thread;
 
+    /* Initialize test framework */
+    state = SDLTest_CommonCreateState(argv, 0);
+    if (state == NULL) {
+        return 1;
+    }
+
     /* Enable standard application logging */
     SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
 
+    /* Parse commandline */
+    for (i = 1; i < argc;) {
+        int consumed;
+
+        consumed = SDLTest_CommonArg(state, i);
+        if (!consumed) {
+            if (SDL_strcmp("--prio", argv[i]) == 0) {
+                testprio = 1;
+                consumed = 1;
+            }
+        }
+        if (consumed <= 0) {
+            static const char *options[] = { "[--prio]", NULL };
+            SDLTest_CommonLogUsage(state, argv[0], options);
+            exit(1);
+        }
+
+        i += consumed;
+    }
+
     /* Load the SDL library */
     if (SDL_Init(0) < 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
@@ -100,13 +129,6 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    while (argv[arg] && *argv[arg] == '-') {
-        if (SDL_strcmp(argv[arg], "--prio") == 0) {
-            testprio = 1;
-        }
-        ++arg;
-    }
-
     tls = SDL_TLSCreate();
     SDL_assert(tls);
     SDL_TLSSet(tls, "main thread", NULL);