diff --git a/msgaddr_test.go b/msgaddr_test.go
index dd147b23..32790211 100644
--- a/msgaddr_test.go
+++ b/msgaddr_test.go
@@ -310,7 +310,7 @@ func TestAddrWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
diff --git a/msggetblocks_test.go b/msggetblocks_test.go
index 49cdb42a..8420f15b 100644
--- a/msggetblocks_test.go
+++ b/msggetblocks_test.go
@@ -380,7 +380,7 @@ func TestGetBlocksWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
diff --git a/msggetdata_test.go b/msggetdata_test.go
index bfa31e20..47822e68 100644
--- a/msggetdata_test.go
+++ b/msggetdata_test.go
@@ -312,11 +312,10 @@ func TestGetDataWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
 		}
-
 	}
 }
diff --git a/msggetheaders_test.go b/msggetheaders_test.go
index 063ad2d4..1a1210db 100644
--- a/msggetheaders_test.go
+++ b/msggetheaders_test.go
@@ -372,7 +372,7 @@ func TestGetHeadersWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
diff --git a/msgheaders_test.go b/msgheaders_test.go
index 07a58b3b..e3142f98 100644
--- a/msgheaders_test.go
+++ b/msgheaders_test.go
@@ -338,7 +338,7 @@ func TestHeadersWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
diff --git a/msginv_test.go b/msginv_test.go
index 056269d2..6d0c9460 100644
--- a/msginv_test.go
+++ b/msginv_test.go
@@ -312,7 +312,7 @@ func TestInvWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
diff --git a/msgnotfound_test.go b/msgnotfound_test.go
index b5c411ab..48741094 100644
--- a/msgnotfound_test.go
+++ b/msgnotfound_test.go
@@ -312,11 +312,10 @@ func TestNotFoundWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}
 		}
-
 	}
 }
diff --git a/msgpong_test.go b/msgpong_test.go
index 21bdf198..81be02c3 100644
--- a/msgpong_test.go
+++ b/msgpong_test.go
@@ -265,7 +265,7 @@ func TestPongWireErrors(t *testing.T) {
 		// them for equality.
 		if _, ok := err.(*btcwire.MessageError); !ok {
 			if err != test.readErr {
-				t.Errorf("BtcEncode #%d wrong error got: %v, "+
+				t.Errorf("BtcDecode #%d wrong error got: %v, "+
 					"want: %v", i, err, test.readErr)
 				continue
 			}