diff --git a/server.go b/server.go
index 1c42b6ef..d71c094e 100644
--- a/server.go
+++ b/server.go
@@ -279,7 +279,7 @@ func (s *Server) serveNewHTTP2Transport(c net.Conn, authInfo credentials.AuthInf
 		return
 	}
 	if !s.addConn(st) {
-		c.Close()
+		st.Close()
 		return
 	}
 	s.serveStreams(st)
diff --git a/test/end2end_test.go b/test/end2end_test.go
index f1c7b426..ff04c27c 100644
--- a/test/end2end_test.go
+++ b/test/end2end_test.go
@@ -1354,8 +1354,6 @@ func interestingGoroutines() (gs []string) {
 	return
 }
 
-var failOnLeaks = flag.Bool("fail_on_leaks", false, "Fail tests if goroutines leak.")
-
 // leakCheck snapshots the currently-running goroutines and returns a
 // function to be run at the end of tests to see whether any
 // goroutines leaked.
@@ -1364,10 +1362,6 @@ func leakCheck(t testing.TB) func() {
 	for _, g := range interestingGoroutines() {
 		orig[g] = true
 	}
-	leakf := t.Logf
-	if *failOnLeaks {
-		leakf = t.Errorf
-	}
 	return func() {
 		// Loop, waiting for goroutines to shut down.
 		// Wait up to 5 seconds, but finish as quickly as possible.
@@ -1387,7 +1381,7 @@ func leakCheck(t testing.TB) func() {
 				continue
 			}
 			for _, g := range leaked {
-				leakf("Leaked goroutine: %v", g)
+				t.Errorf("Leaked goroutine: %v", g)
 			}
 			return
 		}