diff --git a/.travis.yml b/.travis.yml
index 6f6c4b9..3517023 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: go
 sudo: false
 
 go:
-  - 1.7
   - 1.8
   - 1.9
 
diff --git a/boltcycle/boltcycle.go b/boltcycle/boltcycle.go
index daf7311..62c542e 100644
--- a/boltcycle/boltcycle.go
+++ b/boltcycle/boltcycle.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/signalfx/golib/errors"
 
+	"context"
 	"github.com/boltdb/bolt"
-	"golang.org/x/net/context"
 )
 
 // CycleDB allows you to use a bolt.DB as a pseudo-LRU using a cycle of buckets
diff --git a/boltcycle/boltcycle_test.go b/boltcycle/boltcycle_test.go
index d208416..58720cc 100644
--- a/boltcycle/boltcycle_test.go
+++ b/boltcycle/boltcycle_test.go
@@ -12,11 +12,11 @@ import (
 
 	"bytes"
 
+	"context"
 	"github.com/boltdb/bolt"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 type testSetup struct {
@@ -279,8 +279,9 @@ func TestAsyncWrite(t *testing.T) {
 		Convey("and channel is full", func() {
 			c.readMovements = make(chan readToLocation)
 			Convey("Async write should timeout", func() {
-				ctx, _ := context.WithTimeout(context.Background(), time.Millisecond)
+				ctx, cancelfunc := context.WithTimeout(context.Background(), time.Millisecond)
 				c.AsyncWrite(ctx, []KvPair{{}})
+				cancelfunc()
 			})
 		})
 	})
diff --git a/clientcfg/client.go b/clientcfg/client.go
index f65ef13..6b5b3f0 100644
--- a/clientcfg/client.go
+++ b/clientcfg/client.go
@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/distconf"
 	"github.com/signalfx/golib/errors"
@@ -14,7 +15,6 @@ import (
 	"github.com/signalfx/golib/logkey"
 	"github.com/signalfx/golib/sfxclient"
 	"github.com/signalfx/golib/timekeeper"
-	"golang.org/x/net/context"
 )
 
 // ClientConfig configures a SfxClient
diff --git a/clientcfg/client_test.go b/clientcfg/client_test.go
index 11ced0d..e5c6cd6 100644
--- a/clientcfg/client_test.go
+++ b/clientcfg/client_test.go
@@ -5,12 +5,12 @@ import (
 	"net/url"
 	"testing"
 
+	"context"
 	"github.com/signalfx/golib/datapoint/dptest"
 	"github.com/signalfx/golib/distconf"
 	"github.com/signalfx/golib/log"
 	"github.com/signalfx/golib/sfxclient"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 func TestClient(t *testing.T) {
diff --git a/datapoint/dpsink/counter.go b/datapoint/dpsink/counter.go
index 95af684..ccebaac 100644
--- a/datapoint/dpsink/counter.go
+++ b/datapoint/dpsink/counter.go
@@ -4,11 +4,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	"github.com/signalfx/golib/sfxclient"
-	"golang.org/x/net/context"
 )
 
 // DefaultLogger is used by package structs that don't have a default logger set.
diff --git a/datapoint/dpsink/counter_test.go b/datapoint/dpsink/counter_test.go
index f8bdb75..8718023 100644
--- a/datapoint/dpsink/counter_test.go
+++ b/datapoint/dpsink/counter_test.go
@@ -7,12 +7,12 @@ import (
 
 	"sync/atomic"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/datapoint/dptest"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 const numTests = 7
diff --git a/datapoint/dpsink/discard.go b/datapoint/dpsink/discard.go
index 6262e36..c5edb8a 100644
--- a/datapoint/dpsink/discard.go
+++ b/datapoint/dpsink/discard.go
@@ -1,9 +1,9 @@
 package dpsink
 
 import (
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
-	"golang.org/x/net/context"
 )
 
 type discardSink struct {
diff --git a/datapoint/dpsink/filter.go b/datapoint/dpsink/filter.go
index 8f3e968..05cf4f2 100644
--- a/datapoint/dpsink/filter.go
+++ b/datapoint/dpsink/filter.go
@@ -3,8 +3,8 @@ package dpsink
 import (
 	"sync/atomic"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
-	"golang.org/x/net/context"
 )
 
 // EmptyMetricFilter filters empty metric name datapoints
diff --git a/datapoint/dpsink/filter_test.go b/datapoint/dpsink/filter_test.go
index 147c56a..6339949 100644
--- a/datapoint/dpsink/filter_test.go
+++ b/datapoint/dpsink/filter_test.go
@@ -4,10 +4,10 @@ import (
 	"runtime"
 	"testing"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/datapoint/dptest"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestEmptyMetricFilter(t *testing.T) {
diff --git a/datapoint/dpsink/logfilter.go b/datapoint/dpsink/logfilter.go
index 8acf741..89e8a51 100644
--- a/datapoint/dpsink/logfilter.go
+++ b/datapoint/dpsink/logfilter.go
@@ -1,13 +1,13 @@
 package dpsink
 
 import (
+	"context"
 	"encoding/json"
 	"expvar"
 	"fmt"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
-	"golang.org/x/net/context"
 	"net/http"
 	"sync"
 	"sync/atomic"
diff --git a/datapoint/dpsink/logfilter_test.go b/datapoint/dpsink/logfilter_test.go
index 104fa54..a5011eb 100644
--- a/datapoint/dpsink/logfilter_test.go
+++ b/datapoint/dpsink/logfilter_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 type boolFlagCheck bool
diff --git a/datapoint/dpsink/ratelimitlogger.go b/datapoint/dpsink/ratelimitlogger.go
index 3d4bd2f..cae6bae 100644
--- a/datapoint/dpsink/ratelimitlogger.go
+++ b/datapoint/dpsink/ratelimitlogger.go
@@ -4,10 +4,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
-	"golang.org/x/net/context"
 )
 
 // RateLimitErrorLogging does a log of errors forwarding points in a rate limited manner
diff --git a/datapoint/dpsink/ratelimitlogger_test.go b/datapoint/dpsink/ratelimitlogger_test.go
index c625911..8ce103d 100644
--- a/datapoint/dpsink/ratelimitlogger_test.go
+++ b/datapoint/dpsink/ratelimitlogger_test.go
@@ -5,12 +5,12 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/datapoint/dptest"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 func TestRateLimitErrorLogging(t *testing.T) {
diff --git a/datapoint/dpsink/sink.go b/datapoint/dpsink/sink.go
index b64d16d..643ea70 100644
--- a/datapoint/dpsink/sink.go
+++ b/datapoint/dpsink/sink.go
@@ -1,9 +1,9 @@
 package dpsink
 
 import (
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
-	"golang.org/x/net/context"
 )
 
 // A DSink is an object that can accept datapoints and do something with them, like forward them
diff --git a/datapoint/dpsink/sink_test.go b/datapoint/dpsink/sink_test.go
index 6aeb9b7..11868b2 100644
--- a/datapoint/dpsink/sink_test.go
+++ b/datapoint/dpsink/sink_test.go
@@ -1,12 +1,12 @@
 package dpsink
 
 import (
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/datapoint/dptest"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 	"testing"
 )
 
diff --git a/datapoint/dptest/basicsink.go b/datapoint/dptest/basicsink.go
index fcb5806..f5c0434 100644
--- a/datapoint/dptest/basicsink.go
+++ b/datapoint/dptest/basicsink.go
@@ -3,9 +3,9 @@ package dptest
 import (
 	"sync"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
-	"golang.org/x/net/context"
 )
 
 // BasicSink is a pure testing sink that blocks forwarded points onto a channel
diff --git a/datapoint/dptest/basicsink_test.go b/datapoint/dptest/basicsink_test.go
index bdc5b63..38787b5 100644
--- a/datapoint/dptest/basicsink_test.go
+++ b/datapoint/dptest/basicsink_test.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 	"testing"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestBasicSink(t *testing.T) {
diff --git a/log/ctxdims.go b/log/ctxdims.go
index 1280b1e..93d3741 100644
--- a/log/ctxdims.go
+++ b/log/ctxdims.go
@@ -1,6 +1,6 @@
 package log
 
-import "golang.org/x/net/context"
+import "context"
 
 // CtxDimensions can propagate log dimensions inside a context object
 type CtxDimensions struct {
diff --git a/log/ctxdims_test.go b/log/ctxdims_test.go
index 86ccc7b..aad7431 100644
--- a/log/ctxdims_test.go
+++ b/log/ctxdims_test.go
@@ -2,8 +2,8 @@ package log
 
 import (
 	"bytes"
+	"context"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 	"testing"
 )
 
diff --git a/pdbcycle/pdbcycle.go b/pdbcycle/pdbcycle.go
index c032123..9d4bef1 100644
--- a/pdbcycle/pdbcycle.go
+++ b/pdbcycle/pdbcycle.go
@@ -2,10 +2,10 @@ package pdbcycle
 
 import (
 	"bytes"
+	"context"
 	"github.com/boltdb/bolt"
 	"github.com/signalfx/golib/boltcycle"
 	"github.com/signalfx/golib/errors"
-	"golang.org/x/net/context"
 	"io/ioutil"
 	"os"
 	"path/filepath"
diff --git a/pdbcycle/pdbcycle_test.go b/pdbcycle/pdbcycle_test.go
index 5f15dae..0387a64 100644
--- a/pdbcycle/pdbcycle_test.go
+++ b/pdbcycle/pdbcycle_test.go
@@ -1,12 +1,12 @@
 package pdbcycle
 
 import (
+	"context"
 	"errors"
 	"github.com/boltdb/bolt"
 	"github.com/signalfx/golib/boltcycle"
 	. "github.com/smartystreets/goconvey/convey"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -158,11 +158,15 @@ func Test(t *testing.T) {
 							So(err, ShouldBeNil)
 							So(len(infos), ShouldEqual, 3)
 							Convey("can only get data that was accessed, not the non accessed data", func() {
-								data, err := pdb.Read([][]byte{[]byte("first"), []byte("firsttwo")})
-								So(err, ShouldBeNil)
-								So(len(data), ShouldEqual, 2)
-								So(string(data[0]), ShouldEqual, "")
-								So(string(data[1]), ShouldEqual, "firsttwodata")
+								for {
+									data, err := pdb.Read([][]byte{[]byte("first"), []byte("firsttwo")})
+									So(err, ShouldBeNil)
+									So(len(data), ShouldEqual, 2)
+									if string(data[0]) == "" && string(data[1]) == "firsttwodata" {
+										break
+									}
+									runtime.Gosched()
+								}
 								Convey("close and reopen", func() {
 									So(pdb.Close(), ShouldBeNil)
 									pdb, err = New(dir,
diff --git a/sfxclient/cancel14.go b/sfxclient/cancel14.go
index 84744c2..39ad33d 100644
--- a/sfxclient/cancel14.go
+++ b/sfxclient/cancel14.go
@@ -5,7 +5,7 @@ package sfxclient
 import (
 	"net/http"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 type canceler interface {
diff --git a/sfxclient/cancel14_test.go b/sfxclient/cancel14_test.go
index 3faebe4..72dab2e 100644
--- a/sfxclient/cancel14_test.go
+++ b/sfxclient/cancel14_test.go
@@ -3,7 +3,7 @@
 package sfxclient
 
 import "net/http"
-import "golang.org/x/net/context"
+import "context"
 import "testing"
 
 func cancelChanFromReq(req *http.Request) <-chan struct{} {
diff --git a/sfxclient/cancel15.go b/sfxclient/cancel15.go
index cc1933d..7c3ee84 100644
--- a/sfxclient/cancel15.go
+++ b/sfxclient/cancel15.go
@@ -5,7 +5,7 @@ package sfxclient
 import (
 	"net/http"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 func (h *HTTPSink) withCancel(ctx context.Context, req *http.Request) (err error) {
diff --git a/sfxclient/cumulativebucket_test.go b/sfxclient/cumulativebucket_test.go
index ad54b46..24fe04c 100644
--- a/sfxclient/cumulativebucket_test.go
+++ b/sfxclient/cumulativebucket_test.go
@@ -5,10 +5,10 @@ import (
 	"sync"
 	"testing"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 func dpNamed(name string, dps []*datapoint.Datapoint) *datapoint.Datapoint {
diff --git a/sfxclient/httpsink.go b/sfxclient/httpsink.go
index 3689fd1..2a07593 100644
--- a/sfxclient/httpsink.go
+++ b/sfxclient/httpsink.go
@@ -12,12 +12,12 @@ import (
 	"time"
 	"unicode"
 
+	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/signalfx/com_signalfx_metrics_protobuf"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/errors"
 	"github.com/signalfx/golib/event"
-	"golang.org/x/net/context"
 )
 
 // ClientVersion is the version of this library and is embedded into the user agent
diff --git a/sfxclient/httpsink_test.go b/sfxclient/httpsink_test.go
index f6ed11c..9bded9b 100644
--- a/sfxclient/httpsink_test.go
+++ b/sfxclient/httpsink_test.go
@@ -11,6 +11,7 @@ import (
 	"net"
 	"strings"
 
+	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/signalfx/com_signalfx_metrics_protobuf"
 	"github.com/signalfx/golib/datapoint"
@@ -18,7 +19,6 @@ import (
 	"github.com/signalfx/golib/event"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 type errReader struct {
@@ -267,6 +267,7 @@ func TestHTTPDatapointSink(t *testing.T) {
 				if !strings.Contains(s, "canceled") && !strings.Contains(s, "closed") {
 					t.Errorf("Bad error string %s", s)
 				}
+				cancelCallback()
 			})
 			Convey("timeouts should work", func() {
 				blockResponse = make(chan struct{})
@@ -473,6 +474,7 @@ func TestHTTPEventSink(t *testing.T) {
 				if !strings.Contains(s, "canceled") && !strings.Contains(s, "closed") {
 					t.Errorf("Bad error string %s", s)
 				}
+				cancelCallback()
 			})
 			Convey("timeouts should work", func() {
 				blockResponse = make(chan struct{})
diff --git a/sfxclient/integration_test.go b/sfxclient/integration_test.go
index c0845b2..f0f5517 100644
--- a/sfxclient/integration_test.go
+++ b/sfxclient/integration_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 type tokenInfo struct {
diff --git a/sfxclient/multitokensink.go b/sfxclient/multitokensink.go
index f834774..8e56529 100644
--- a/sfxclient/multitokensink.go
+++ b/sfxclient/multitokensink.go
@@ -10,9 +10,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
-	"golang.org/x/net/context"
 )
 
 // ContextKey is a custom key type for context values
diff --git a/sfxclient/multitokensink_test.go b/sfxclient/multitokensink_test.go
index 51f7ea2..701e26b 100644
--- a/sfxclient/multitokensink_test.go
+++ b/sfxclient/multitokensink_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/juju/errors"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/event"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 func TestAsyncMultiTokenSinkStartup(t *testing.T) {
diff --git a/sfxclient/sfxclient.go b/sfxclient/sfxclient.go
index c7d0a09..6bd9b79 100644
--- a/sfxclient/sfxclient.go
+++ b/sfxclient/sfxclient.go
@@ -64,10 +64,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"context"
 	"github.com/signalfx/golib/errors"
 	"github.com/signalfx/golib/log"
 	"github.com/signalfx/golib/timekeeper"
-	"golang.org/x/net/context"
 )
 
 // DefaultReportingDelay is the default interval Scheduler users to report metrics to SignalFx
diff --git a/sfxclient/sfxclient_test.go b/sfxclient/sfxclient_test.go
index 3d9defa..5244b1f 100644
--- a/sfxclient/sfxclient_test.go
+++ b/sfxclient/sfxclient_test.go
@@ -8,11 +8,11 @@ import (
 
 	"fmt"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/errors"
 	"github.com/signalfx/golib/timekeeper/timekeepertest"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 type testSink struct {
diff --git a/sfxclient/wrapper_test.go b/sfxclient/wrapper_test.go
index 6be17cf..c506963 100644
--- a/sfxclient/wrapper_test.go
+++ b/sfxclient/wrapper_test.go
@@ -4,9 +4,9 @@ import (
 	"sync/atomic"
 	"testing"
 
+	"context"
 	"github.com/signalfx/golib/datapoint"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 )
 
 func TestNewMultiCollector(t *testing.T) {
diff --git a/web/closeheader.go b/web/closeheader.go
index 80b9a80..9901108 100644
--- a/web/closeheader.go
+++ b/web/closeheader.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"sync/atomic"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // CloseHeader is used to control when connections should signal they should be closed
diff --git a/web/closeheader_test.go b/web/closeheader_test.go
index e27daaa..f32d547 100644
--- a/web/closeheader_test.go
+++ b/web/closeheader_test.go
@@ -5,8 +5,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestCloseHeader(t *testing.T) {
diff --git a/web/ctxflag.go b/web/ctxflag.go
index 2fbad3b..647b14d 100644
--- a/web/ctxflag.go
+++ b/web/ctxflag.go
@@ -1,8 +1,8 @@
 package web
 
 import (
+	"context"
 	"github.com/signalfx/golib/log"
-	"golang.org/x/net/context"
 	"math/rand"
 	"net/http"
 	"strconv"
diff --git a/web/ctxflag_test.go b/web/ctxflag_test.go
index d913d99..eb43b7a 100644
--- a/web/ctxflag_test.go
+++ b/web/ctxflag_test.go
@@ -1,9 +1,9 @@
 package web
 
 import (
+	"context"
 	"github.com/signalfx/golib/log"
 	. "github.com/smartystreets/goconvey/convey"
-	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
diff --git a/web/reqlatencycounter.go b/web/reqlatencycounter.go
index de83fad..8b246c1 100644
--- a/web/reqlatencycounter.go
+++ b/web/reqlatencycounter.go
@@ -4,7 +4,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/signalfx/golib/datapoint"
 	"github.com/signalfx/golib/timekeeper"
diff --git a/web/reqlatencycounter_test.go b/web/reqlatencycounter_test.go
index f27a475..e053d1d 100644
--- a/web/reqlatencycounter_test.go
+++ b/web/reqlatencycounter_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/signalfx/golib/timekeeper/timekeepertest"
 	. "github.com/smartystreets/goconvey/convey"
diff --git a/web/starttime.go b/web/starttime.go
index 9a87451..01e967e 100644
--- a/web/starttime.go
+++ b/web/starttime.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // AddRequestTime is a web context that adds the current time to the request's context
diff --git a/web/starttime_test.go b/web/starttime_test.go
index b0561e8..dad5d5c 100644
--- a/web/starttime_test.go
+++ b/web/starttime_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestAddRequestTime(t *testing.T) {
diff --git a/web/tester.go b/web/tester.go
index a9f66bb..5714c41 100644
--- a/web/tester.go
+++ b/web/tester.go
@@ -1,7 +1,7 @@
 package web
 
 import (
-	"golang.org/x/net/context"
+	"context"
 	"net/http"
 )
 
diff --git a/web/web.go b/web/web.go
index a154bf3..5919cb6 100644
--- a/web/web.go
+++ b/web/web.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"sync"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // Note: Borrowed greatly from goji, but I would rather use context as the middleware context than
diff --git a/web/web_test.go b/web/web_test.go
index ae3baeb..c9ce4d9 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -10,10 +10,10 @@ import (
 
 	"sync/atomic"
 
+	"context"
 	"github.com/signalfx/golib/errors"
 	. "github.com/smartystreets/goconvey/convey"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 type IncrHandler struct {