diff --git a/server/v2/commands.go b/server/v2/commands.go
index d5c202ade9f7..c64fbc1f0de4 100644
--- a/server/v2/commands.go
+++ b/server/v2/commands.go
@@ -120,9 +120,15 @@ func createStartCommand[T transaction.Tx](
 			go func() {
 				sigCh := make(chan os.Signal, 1)
 				signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
-				sig := <-sigCh
-				cancelFn()
-				cmd.Printf("caught %s signal\n", sig.String())
+				select {
+				case sig := <-sigCh:
+					cancelFn()
+					cmd.Printf("caught %s signal\n", sig.String())
+				case <-ctx.Done():
+					// If the root context is canceled (which is likely to happen in tests involving cobra commands),
+					// don't block waiting for the OS signal before stopping the server.
+					cancelFn()
+				}
 
 				if err := server.Stop(ctx); err != nil {
 					cmd.PrintErrln("failed to stop servers:", err)