bencode/api.go            | 2 +-
 peer_protocol/pex_test.go | 2 +-

diff --git a/bencode/api.go b/bencode/api.go
index 3e3c1633b39d63f02ebbdf9b8fb625bed17bc616..10375c434ac79724003c8c3ac39e0307d10f4664 100644
--- a/bencode/api.go
+++ b/bencode/api.go
@@ -130,7 +130,7 @@
 // Unmarshal the bencode value in the 'data' to a value pointed by the 'v'
 // pointer, return a non-nil error if any.
 func Unmarshal(data []byte, v interface{}) (err error) {
-	buf := bytes.NewBuffer(data)
+	buf := bytes.NewReader(data)
 	e := Decoder{r: buf}
 	err = e.Decode(v)
 	if err == nil && buf.Len() != 0 {
diff --git a/peer_protocol/pex_test.go b/peer_protocol/pex_test.go
index adfab295b10e97437b235994c07981270616eab3..cc45059e7bd04e906093762d0583e7401de9f1be 100644
--- a/peer_protocol/pex_test.go
+++ b/peer_protocol/pex_test.go
@@ -48,7 +48,7 @@ 	require.EqualValues(t, b, expected)
 
 	msg = Message{}
 	dec := Decoder{
-		R:         bufio.NewReader(bytes.NewBuffer(b)),
+		R:         bufio.NewReader(bytes.NewReader(b)),
 		MaxLength: 128,
 	}
 	pmOut := PexMsg{}