diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go
index 59439e524..547f8005b 100644
--- a/etcdserver/etcdhttp/http.go
+++ b/etcdserver/etcdhttp/http.go
@@ -136,7 +136,7 @@ func (h serverHandler) serveRaft(w http.ResponseWriter, r *http.Request) {
 		writeError(w, err)
 		return
 	}
-	w.WriteHeader(http.StatusOK)
+	w.WriteHeader(http.StatusNoContent)
 }
 
 // genID generates a random id that is: n < 0 < n.
diff --git a/etcdserver/etcdhttp/http_test.go b/etcdserver/etcdhttp/http_test.go
index c341a0df0..b48fa9df3 100644
--- a/etcdserver/etcdhttp/http_test.go
+++ b/etcdserver/etcdhttp/http_test.go
@@ -814,7 +814,7 @@ func TestServeRaft(t *testing.T) {
 				),
 			),
 			nil,
-			http.StatusOK,
+			http.StatusNoContent,
 		},
 	}
 	for i, tt := range testCases {
@@ -822,14 +822,13 @@ func TestServeRaft(t *testing.T) {
 		if err != nil {
 			t.Fatalf("#%d: could not create request: %#v", i, err)
 		}
-		h := Handler{
-			Timeout: time.Hour,
-			Server:  &errServer{tt.serverErr},
-			Peers:   nil,
+		h := &serverHandler{
+			timeout: time.Hour,
+			server:  &errServer{tt.serverErr},
+			peers:   nil,
 		}
-		c := context.Background()
 		rw := httptest.NewRecorder()
-		h.serveRaft(c, rw, req)
+		h.serveRaft(rw, req)
 		if rw.Code != tt.wcode {
 			t.Errorf("#%d: got code=%d, want %d", i, rw.Code, tt.wcode)
 		}
diff --git a/etcdserver/etcdhttp/peers.go b/etcdserver/etcdhttp/peers.go
index bba16fc88..cd5fe0e43 100644
--- a/etcdserver/etcdhttp/peers.go
+++ b/etcdserver/etcdhttp/peers.go
@@ -131,7 +131,7 @@ func httpPost(url string, data []byte) bool {
 		return false
 	}
 	resp.Body.Close()
-	if resp.StatusCode != 200 {
+	if resp.StatusCode != http.StatusNoContent {
 		elog.TODO()
 		return false
 	}
diff --git a/etcdserver/etcdhttp/peers_test.go b/etcdserver/etcdhttp/peers_test.go
index 4942fd006..f1d4617de 100644
--- a/etcdserver/etcdhttp/peers_test.go
+++ b/etcdserver/etcdhttp/peers_test.go
@@ -124,14 +124,21 @@ func TestHttpPost(t *testing.T) {
 		{
 			http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				tr = r
-				w.WriteHeader(200)
+				w.WriteHeader(http.StatusNoContent)
 			}),
 			true,
 		},
 		{
 			http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				tr = r
-				w.WriteHeader(404)
+				w.WriteHeader(http.StatusNotFound)
+			}),
+			false,
+		},
+		{
+			http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				tr = r
+				w.WriteHeader(http.StatusInternalServerError)
 			}),
 			false,
 		},