diff --git a/Makefile.am b/Makefile.am
index 105748a4..8265d042 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,7 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in
 ## Cross-compile tests
 cross_implibs = crosslibs/d3d12
 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include
-CROSS_CFLAGS = -g -O2 -Wall ${CROSS_CPPFLAGS}
+CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS}
 
 if HAS_CROSSTARGET32
 CROSS32_CC = @CROSSCC32@
diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h
index 61fe3735..785173d0 100644
--- a/include/private/vkd3d_test.h
+++ b/include/private/vkd3d_test.h
@@ -162,7 +162,7 @@ static void vkd3d_test_trace(unsigned int line, const char *fmt, ...)
     va_end(args);
 }
 
-int main(int argc, char **argv)
+int wmain(void)
 {
     const char *vkd3d_test_debug;