diff --git a/metropolis/pkg/supervisor/supervisor_test.go b/metropolis/pkg/supervisor/supervisor_test.go
index cf303e8..7f2ffa4 100644
--- a/metropolis/pkg/supervisor/supervisor_test.go
+++ b/metropolis/pkg/supervisor/supervisor_test.go
@@ -63,11 +63,9 @@
 
 		<-ctx.Done()
 
-		go func() {
-			if done != nil {
-				done <- struct{}{}
-			}
-		}()
+		if done != nil {
+			done <- struct{}{}
+		}
 
 		return ctx.Err()
 	}
@@ -95,11 +93,9 @@
 
 		<-ctx.Done()
 
-		go func() {
-			if done != nil {
-				done <- struct{}{}
-			}
-		}()
+		if done != nil {
+			done <- struct{}{}
+		}
 		return ctx.Err()
 	}
 }
@@ -271,12 +267,7 @@
 
 	// Kill off two, one should restart.
 	two.die()
-	s.waitSettleError(ctx, t)
-	select {
-	case <-d1:
-	default:
-		t.Fatalf("runnable 'one' didn't acknowledge cancel")
-	}
+	<-d1
 
 	// And one should start running again.
 	s.waitSettleError(ctx, t)
@@ -318,12 +309,7 @@
 
 	// Kill off two, one should restart.
 	two.die()
-	s.waitSettleError(ctx, t)
-	select {
-	case <-d1:
-	default:
-		t.Fatalf("runnable 'one' didn't acknowledge cancel")
-	}
+	<-d1
 
 	// And one should start running again.
 	s.waitSettleError(ctx, t)
@@ -365,12 +351,7 @@
 
 	// Kill off two, one should restart.
 	two.panic()
-	s.waitSettleError(ctx, t)
-	select {
-	case <-d1:
-	default:
-		t.Fatalf("runnable 'one' didn't acknowledge cancel")
-	}
+	<-d1
 
 	// And one should start running again.
 	s.waitSettleError(ctx, t)