diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c
index 5d4f659fb1f162eff8c293b80cb9788c240964a2..bd3c50d736742efab5a70bd0315d39bf6df3565a 100644
--- a/test/core/util/test_config.c
+++ b/test/core/util/test_config.c
@@ -54,8 +54,10 @@ static unsigned seed(void) { return _getpid(); }
 #endif
 
 #if GPR_WINDOWS_CRASH_HANDLER
-#include <tchar.h>
 #include <windows.h>
+
+#include <tchar.h>
+
 #define DBGHELP_TRANSLATE_TCHAR
 #include <dbghelp.h>
 
@@ -93,7 +95,7 @@ static void print_current_stack() {
   frames = frames < MAX_CALLERS_SHOWN ? frames : MAX_CALLERS_SHOWN;
   for (unsigned int i = 0; i < frames; i++) {
     SymFromAddrW(process, (DWORD64)(callers_stack[i]), 0, symbol);
-    fwprintf(stderr, L"*** %d: %016I64LX %ls - %016I64LX\n", i,
+    fwprintf(stderr, L"*** %d: %016I64X %ls - %016I64X\n", i,
              (DWORD64)callers_stack[i], symbol->Name, (DWORD64)symbol->Address);
   }
 
@@ -148,7 +150,7 @@ static void print_stack_from_context(CONTEXT c) {
     BOOL has_symbol =
         SymFromAddrW(process, (DWORD64)(s.AddrPC.Offset), 0, symbol);
     fwprintf(
-        stderr, L"*** %016I64LX %ls - %016I64LX\n", (DWORD64)(s.AddrPC.Offset),
+        stderr, L"*** %016I64X %ls - %016I64X\n", (DWORD64)(s.AddrPC.Offset),
         has_symbol ? symbol->Name : L"<<no symbol>>", (DWORD64)symbol->Address);
   }