diff --git a/internal/jsonrpc2/messages.go b/internal/jsonrpc2/messages.go
index 58d285d..c29a0e8 100644
--- a/internal/jsonrpc2/messages.go
+++ b/internal/jsonrpc2/messages.go
@@ -6,8 +6,9 @@
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
+
+	errors "golang.org/x/xerrors"
 )
 
 // Message is the interface to all jsonrpc2 message types.
diff --git a/internal/jsonrpc2/serve.go b/internal/jsonrpc2/serve.go
index 6589ed3..b9e31a8 100644
--- a/internal/jsonrpc2/serve.go
+++ b/internal/jsonrpc2/serve.go
@@ -6,7 +6,6 @@
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -14,6 +13,7 @@
 	"time"
 
 	"golang.org/x/tools/internal/event"
+	errors "golang.org/x/xerrors"
 )
 
 // NOTE: This file provides an experimental API for serving multiple remote