diff --git a/tests/server/util.c b/tests/server/util.c
index 2bb5b3f96d..41bfe6aa99 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -696,12 +696,9 @@ void restore_signal_handlers(bool keep_sigalrm)
       }
     }
   }
-  if(exit_event) {
-    if(CloseHandle(exit_event)) {
-      exit_event = NULL;
-    }
-  }
 #endif
+  if(exit_event && CloseHandle(exit_event))
+    exit_event = NULL;
 #endif
 }