diff --git a/http.go b/http.go
index ba35dab..516382c 100644
--- a/http.go
+++ b/http.go
@@ -4,6 +4,7 @@ package http
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -21,8 +22,6 @@ import (
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/selector"
 	"github.com/micro/go-micro/transport"
-
-	"golang.org/x/net/context"
 )
 
 type httpClient struct {
diff --git a/http_test.go b/http_test.go
index 520dd93..d04e77f 100644
--- a/http_test.go
+++ b/http_test.go
@@ -3,6 +3,7 @@ package http
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -15,8 +16,6 @@ import (
 	"github.com/micro/go-micro/selector"
 	"github.com/micro/go-plugins/client/http/test"
 	"github.com/micro/go-plugins/registry/memory"
-
-	"golang.org/x/net/context"
 )
 
 func TestHTTPClient(t *testing.T) {
diff --git a/stream.go b/stream.go
index 17d5085..da8374e 100644
--- a/stream.go
+++ b/stream.go
@@ -3,6 +3,7 @@ package http
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"errors"
 	"io/ioutil"
 	"net"
@@ -11,8 +12,6 @@ import (
 	"sync"
 
 	"github.com/micro/go-micro/client"
-
-	"golang.org/x/net/context"
 )
 
 // Implements the streamer interface