diff --git a/integration-test/check_test.go b/integration-test/check_test.go
index 23508e714..a3214aab1 100644
--- a/integration-test/check_test.go
+++ b/integration-test/check_test.go
@@ -223,6 +223,10 @@ func (cs *ContainerdSuite) TearDownTest(c *check.C) {
 			fmt.Fprintf(os.Stderr, "Failed to cleanup leftover test containers: %v", err)
 		}
 
-		<-ch
+		select {
+		case <-ch:
+		case <-time.After(3 * time.Second):
+			fmt.Fprintf(os.Stderr, "TearDownTest: Containerd %v didn't die after 3 seconds", ctr.Id)
+		}
 	}
 }