diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index e6b004cc0..b008a4f5d 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -2345,7 +2345,7 @@ int http_fn_cfg_pins(http_request_t* request) {
 		alias = HAL_PIN_GetPinNameAlias(i);
 		poststr(request, "<div class=\"hdiv\">");
 		if (alias) {
-#ifdef PLATFORM_BEKEN
+#if defined(PLATFORM_BEKEN) || defined(WINDOWS)
 			hprintf255(request, "P%i (%s) ", i, alias);
 #else
 			poststr(request, alias);
diff --git a/src/win_main.c b/src/win_main.c
index 0f1480a89..bac54e5a1 100644
--- a/src/win_main.c
+++ b/src/win_main.c
@@ -117,7 +117,7 @@ void Win_DoUnitTests() {
 #include "sim/sim_public.h"
 int __cdecl main(int argc, char **argv)
 {
-	bool bWantsUnitTests = false;
+	bool bWantsUnitTests = 1;
     WSADATA wsaData;
     int iResult;
     // Initialize Winsock
@@ -126,19 +126,22 @@ int __cdecl main(int argc, char **argv)
         printf("WSAStartup failed with error: %d\n", iResult);
         return 1;
     }
-
-	SIM_CreateWindow(argc, argv);
-
 	Main_Init();
 
+
+	if (bWantsUnitTests) {
+		// let things warm up a little
+		Sim_RunFrames(50, false);
+		// run tests
+		Win_DoUnitTests();
+		Sim_RunFrames(50, false);
+	}
+
+	SIM_CreateWindow(argc, argv);
 	while(1) {
 		Sleep(5);
 		Sim_RunFrame();
 		SIM_RunWindow();
-
-		if (bWantsUnitTests && win_frameNum == 50) {
-			Win_DoUnitTests();
-		}
 	}
 	return 0;
 }