diff --git a/services/device/deviced/internal/impl/utiltest/app.go b/services/device/deviced/internal/impl/utiltest/app.go
index ab31297..e425083 100644
--- a/services/device/deviced/internal/impl/utiltest/app.go
+++ b/services/device/deviced/internal/impl/utiltest/app.go
@@ -139,9 +139,11 @@
 	// Some of our tests look for log files, so make sure they are flushed
 	// to ensure that at least the files exist.
 	ctx.FlushLog()
+
+	shutdownChan := signals.ShutdownOnSignals(ctx)
 	ping(ctx, *flagValue)
 
-	<-signals.ShutdownOnSignals(ctx)
+	<-shutdownChan
 	if err := ioutil.WriteFile("testfile", []byte("goodbye world"), 0600); err != nil {
 		ctx.Fatalf("Failed to write testfile: %v", err)
 	}