diff --git a/tst/winfsp-tests/winfsp-tests.c b/tst/winfsp-tests/winfsp-tests.c
index 3a79a083..602f1e2f 100644
--- a/tst/winfsp-tests/winfsp-tests.c
+++ b/tst/winfsp-tests/winfsp-tests.c
@@ -192,10 +192,11 @@ LONG WINAPI UnhandledExceptionHandler(struct _EXCEPTION_POINTERS *ExceptionInfo)
             &Large.QuadPart,
             &Info.V))
         {
-            wsprintfA(OutBuf, "\nEXCEPTION 0x%lX at %s+0x%lX\n",
+            wsprintfA(OutBuf, "\nEXCEPTION 0x%lX at %s+0x%lX(0x%p)\n",
                 ExceptionInfo->ExceptionRecord->ExceptionCode,
                 Info.V.Name,
-                Large.LowPart);
+                Large.LowPart,
+                ExceptionInfo->ExceptionRecord->ExceptionAddress);
         }
         else
         {