diff --git a/client/v3/txn_test.go b/client/v3/txn_test.go
index 012c965a5..0ee6e71d6 100644
--- a/client/v3/txn_test.go
+++ b/client/v3/txn_test.go
@@ -27,7 +27,7 @@ func TestTxnPanics(t *testing.T) {
 
 	kv := &kv{}
 
-	errc := make(chan string, 1)
+	errc := make(chan string, 6)
 	df := func() {
 		if s := recover(); s != nil {
 			errc <- s.(string)
diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go
index d2d98990e..6424cbb7c 100644
--- a/pkg/proxy/server_test.go
+++ b/pkg/proxy/server_test.go
@@ -96,6 +96,7 @@ func testServer(t *testing.T, scheme string, secure bool, delayTx bool) {
 	writec <- data1
 	now := time.Now()
 	if d := <-recvc; !bytes.Equal(data1, d) {
+		close(writec)
 		t.Fatalf("expected %q, got %q", string(data1), string(d))
 	}
 	took1 := time.Since(now)
@@ -110,6 +111,7 @@ func testServer(t *testing.T, scheme string, secure bool, delayTx bool) {
 	writec <- data2
 	now = time.Now()
 	if d := <-recvc; !bytes.Equal(data2, d) {
+		close(writec)
 		t.Fatalf("expected %q, got %q", string(data2), string(d))
 	}
 	took2 := time.Since(now)
@@ -122,6 +124,7 @@ func testServer(t *testing.T, scheme string, secure bool, delayTx bool) {
 	if delayTx {
 		p.UndelayTx()
 		if took2 < lat-rv {
+			close(writec)
 			t.Fatalf("expected took2 %v (with latency) > delay: %v", took2, lat-rv)
 		}
 	}
diff --git a/server/storage/backend/backend_test.go b/server/storage/backend/backend_test.go
index 6434ba931..389fa73be 100644
--- a/server/storage/backend/backend_test.go
+++ b/server/storage/backend/backend_test.go
@@ -32,7 +32,7 @@ func TestBackendClose(t *testing.T) {
 	b, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
 
 	// check close could work
-	done := make(chan struct{})
+	done := make(chan struct{}, 1)
 	go func() {
 		err := b.Close()
 		if err != nil {