diff --git a/cli/prepare.go b/cli/prepare.go
index dbb76a8a52..e74c355fb6 100644
--- a/cli/prepare.go
+++ b/cli/prepare.go
@@ -1,8 +1,6 @@
 package cli
 
 import (
-	"context"
-
 	"github.com/WatchBeam/clock"
 	kitlog "github.com/go-kit/kit/log"
 	"github.com/kolide/kolide-ose/server/config"
@@ -10,6 +8,7 @@ import (
 	"github.com/kolide/kolide-ose/server/kolide"
 	"github.com/kolide/kolide-ose/server/service"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 func createPrepareCmd(configManager config.Manager) *cobra.Command {
diff --git a/server/contexts/host/host.go b/server/contexts/host/host.go
index 3af54b8d88..3343a0c2e6 100644
--- a/server/contexts/host/host.go
+++ b/server/contexts/host/host.go
@@ -3,9 +3,8 @@
 package host
 
 import (
-	"context"
-
 	"github.com/kolide/kolide-ose/server/kolide"
+	"golang.org/x/net/context"
 )
 
 type key int
diff --git a/server/contexts/token/token.go b/server/contexts/token/token.go
index 92266b6510..4d4a9c6f7f 100644
--- a/server/contexts/token/token.go
+++ b/server/contexts/token/token.go
@@ -3,7 +3,7 @@
 package token
 
 import (
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"strings"
 )
diff --git a/server/contexts/viewer/viewer.go b/server/contexts/viewer/viewer.go
index 12bc200fcc..3de527ca68 100644
--- a/server/contexts/viewer/viewer.go
+++ b/server/contexts/viewer/viewer.go
@@ -3,9 +3,8 @@
 package viewer
 
 import (
-	"context"
-
 	"github.com/kolide/kolide-ose/server/kolide"
+	"golang.org/x/net/context"
 )
 
 type key int
diff --git a/server/service/service_invites_test.go b/server/service/service_invites_test.go
index c56d8f827e..a997f25546 100644
--- a/server/service/service_invites_test.go
+++ b/server/service/service_invites_test.go
@@ -1,7 +1,7 @@
 package service
 
 import (
-	"context"
+	"golang.org/x/net/context"
 	"testing"
 
 	"github.com/WatchBeam/clock"
diff --git a/server/service/service_osquery_test.go b/server/service/service_osquery_test.go
index 4b6f6a59c3..c1642e5bc4 100644
--- a/server/service/service_osquery_test.go
+++ b/server/service/service_osquery_test.go
@@ -2,9 +2,9 @@ package service
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
+	"golang.org/x/net/context"
 	"strings"
 	"testing"
 	"time"
diff --git a/server/service/transport_invites_test.go b/server/service/transport_invites_test.go
index 59d76edb39..2bbb4df931 100644
--- a/server/service/transport_invites_test.go
+++ b/server/service/transport_invites_test.go
@@ -2,7 +2,7 @@ package service
 
 import (
 	"bytes"
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
diff --git a/server/service/transport_osquery_test.go b/server/service/transport_osquery_test.go
index 2c3812b1a5..0068002160 100644
--- a/server/service/transport_osquery_test.go
+++ b/server/service/transport_osquery_test.go
@@ -2,7 +2,7 @@ package service
 
 import (
 	"bytes"
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
diff --git a/server/service/transport_users_test.go b/server/service/transport_users_test.go
index b5a824eea6..0f18380dcf 100644
--- a/server/service/transport_users_test.go
+++ b/server/service/transport_users_test.go
@@ -2,7 +2,7 @@ package service
 
 import (
 	"bytes"
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"