diff --git a/provider.go b/provider.go
index 58d0d60bb..294679d2a 100644
--- a/provider.go
+++ b/provider.go
@@ -1,10 +1,10 @@
 package goth
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )
 
diff --git a/providers/cloudfoundry/cf.go b/providers/cloudfoundry/cf.go
index 5df0b32c6..77fbf7d33 100644
--- a/providers/cloudfoundry/cf.go
+++ b/providers/cloudfoundry/cf.go
@@ -4,15 +4,15 @@ package cloudfoundry
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"strings"
 
-	"fmt"
 	"github.com/markbates/goth"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )
 
diff --git a/providers/cloudfoundry/session.go b/providers/cloudfoundry/session.go
index 18a1dc54c..896d4631e 100644
--- a/providers/cloudfoundry/session.go
+++ b/providers/cloudfoundry/session.go
@@ -1,13 +1,13 @@
 package cloudfoundry
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"strings"
 	"time"
 
 	"github.com/markbates/goth"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )