diff --git a/src/encoding/json/stream.go b/src/encoding/json/stream.go
index 81f404f4267d08..cd48167a2d8b6d 100644
--- a/src/encoding/json/stream.go
+++ b/src/encoding/json/stream.go
@@ -379,6 +379,7 @@ func (dec *Decoder) Token() (Token, error) {
 				return dec.tokenError(c)
 			}
 			dec.scanp++
+			dec.scan.bytes++
 			dec.tokenStack = append(dec.tokenStack, dec.tokenState)
 			dec.tokenState = tokenArrayStart
 			return Delim('['), nil
@@ -388,6 +389,7 @@ func (dec *Decoder) Token() (Token, error) {
 				return dec.tokenError(c)
 			}
 			dec.scanp++
+			dec.scan.bytes++
 			dec.tokenState = dec.tokenStack[len(dec.tokenStack)-1]
 			dec.tokenStack = dec.tokenStack[:len(dec.tokenStack)-1]
 			dec.tokenValueEnd()
@@ -398,6 +400,7 @@ func (dec *Decoder) Token() (Token, error) {
 				return dec.tokenError(c)
 			}
 			dec.scanp++
+			dec.scan.bytes++
 			dec.tokenStack = append(dec.tokenStack, dec.tokenState)
 			dec.tokenState = tokenObjectStart
 			return Delim('{'), nil
@@ -407,6 +410,7 @@ func (dec *Decoder) Token() (Token, error) {
 				return dec.tokenError(c)
 			}
 			dec.scanp++
+			dec.scan.bytes++
 			dec.tokenState = dec.tokenStack[len(dec.tokenStack)-1]
 			dec.tokenStack = dec.tokenStack[:len(dec.tokenStack)-1]
 			dec.tokenValueEnd()
@@ -417,17 +421,20 @@ func (dec *Decoder) Token() (Token, error) {
 				return dec.tokenError(c)
 			}
 			dec.scanp++
+			dec.scan.bytes++
 			dec.tokenState = tokenObjectValue
 			continue
 
 		case ',':
 			if dec.tokenState == tokenArrayComma {
 				dec.scanp++
+				dec.scan.bytes++
 				dec.tokenState = tokenArrayValue
 				continue
 			}
 			if dec.tokenState == tokenObjectComma {
 				dec.scanp++
+				dec.scan.bytes++
 				dec.tokenState = tokenObjectKey
 				continue
 			}
@@ -493,6 +500,7 @@ func (dec *Decoder) peek() (byte, error) {
 		for i := dec.scanp; i < len(dec.buf); i++ {
 			c := dec.buf[i]
 			if isSpace(c) {
+				dec.scan.bytes++
 				continue
 			}
 			dec.scanp = i
diff --git a/src/encoding/json/stream_test.go b/src/encoding/json/stream_test.go
index c284f2d9650e3e..52b0c2de2f6edc 100644
--- a/src/encoding/json/stream_test.go
+++ b/src/encoding/json/stream_test.go
@@ -397,10 +397,14 @@ var tokenStreamCases = []tokenStreamCase{
 	}},
 	{json: `{ "\a" }`, expTokens: []interface{}{
 		Delim('{'),
-		&SyntaxError{"invalid character 'a' in string escape code", 3},
+		&SyntaxError{"invalid character 'a' in string escape code", 5},
 	}},
 	{json: ` \a`, expTokens: []interface{}{
-		&SyntaxError{"invalid character '\\\\' looking for beginning of value", 1},
+		&SyntaxError{"invalid character '\\\\' looking for beginning of value", 2},
+	}},
+	{json: `[$t]`, expTokens: []interface{}{
+		Delim('['),
+		&SyntaxError{"invalid character '$' looking for beginning of value", 2},
 	}},
 }