diff --git a/src/SDLmzx.h b/src/SDLmzx.h
index 0b0f3de22..d97d9538e 100644
--- a/src/SDLmzx.h
+++ b/src/SDLmzx.h
@@ -163,7 +163,7 @@ static inline HWND SDL_GetWindowProperty_HWND(SDL_Window *window)
 static inline void *SDL_GetWindowProperty_HWND(SDL_Window *window)
 {
   return SDL_GetProperty(SDL_GetWindowProperties(window),
-   SDL_PROPERTY_WINDOW_WIN32_HWND_POINTER, NULL);
+   SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
 }
 #endif /* _WIN32 */
 
diff --git a/src/main.c b/src/main.c
index 5a787c757..6116c5801 100644
--- a/src/main.c
+++ b/src/main.c
@@ -56,6 +56,10 @@
 
 #ifdef CONFIG_SDL
 #if CONFIG_SDL == 3
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 #include <SDL3/SDL_main.h>
 #else
 #include <SDL.h> /* SDL_main */
diff --git a/testworlds/run.sh b/testworlds/run.sh
index 48106892b..2f5f65dcb 100755
--- a/testworlds/run.sh
+++ b/testworlds/run.sh
@@ -82,8 +82,12 @@ fi
 # Coupled with the software renderer, this will disable video in MZX, speeding things up
 # and allowing for automated testing. Disabling the SDL audio driver will prevent annoying
 # noises from occuring during tests, but shouldn't affect audio-related tests.
+# SDL 1.2 and SDL2
 export SDL_VIDEODRIVER=dummy
 export SDL_AUDIODRIVER=dummy
+# SDL3
+export SDL_VIDEO_DRIVER=dummy
+export SDL_AUDIO_DRIVER=dummy
 
 # Standalone mode will allow tests.mzx to terminate MZX and no_titlescreen mode
 # simplifies things. Disable auto update checking to save time. Some platforms
diff --git a/unit/configure.cpp b/unit/configure.cpp
index adbc8ee58..a8d489a73 100644
--- a/unit/configure.cpp
+++ b/unit/configure.cpp
@@ -31,7 +31,7 @@
 #include "../src/io/vio.h"
 
 #ifdef CONFIG_SDL
-#include <SDL_version.h>
+#include "../src/SDLmzx.h"
 #endif
 
 #ifdef CONFIG_EDITOR