diff --git a/http_transporter.go b/http_transporter.go
index f156815de6..1125f91f5f 100644
--- a/http_transporter.go
+++ b/http_transporter.go
@@ -161,7 +161,6 @@ func (t *HTTPTransporter) appendEntriesHandler(server *Server) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		traceln(server.Name(), "RECV /appendEntries")
 
-		defer r.Body.Close()
 		req := &AppendEntriesRequest{}
 		if _, err := req.decode(r.Body); err != nil {
 			http.Error(w, "", http.StatusBadRequest)
@@ -181,7 +180,6 @@ func (t *HTTPTransporter) requestVoteHandler(server *Server) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		traceln(server.Name(), "RECV /requestVote")
 
-		defer r.Body.Close()
 		req := &RequestVoteRequest{}
 		if _, err := req.decode(r.Body); err != nil {
 			http.Error(w, "", http.StatusBadRequest)
diff --git a/server_test.go b/server_test.go
index 789637e7ae..65d8496c64 100644
--- a/server_test.go
+++ b/server_test.go
@@ -388,7 +388,8 @@ func TestServerMultiNode(t *testing.T) {
 	var leader *Server
 	for _, name := range names {
 		server := newTestServer(name, transporter)
-
+		defer server.Stop()
+		
 		mutex.Lock()
 		servers[name] = server
 		mutex.Unlock()