diff --git a/addr/addr.go b/addr/addr.go
index 08ca90ac46270f81bb315b9cfb78a38139d35336..4a14c437786839e9db6a2ab4b66a8a7f26288902 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -3,10 +3,10 @@ package addrutil
 import (
 	"fmt"
 
+	"context"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
 
 	_ "github.com/whyrusleeping/ws-transport"
 )
diff --git a/dial_test.go b/dial_test.go
index aeeb6ae42d48344b66034a1d6da828008c90d016..ab65b8c59fa0b2b660f009848e4a84fc7d667458 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -10,11 +10,11 @@ import (
 	testutil "github.com/libp2p/go-libp2p/testutil"
 	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
 )
 
 func closeSwarms(swarms []*Swarm) {
diff --git a/peers_test.go b/peers_test.go
index b63e655b110137bf95f5a9260cc2ce7548b0fac9..5eadf4e6716dc98cbe1ade518fde04a86236a4b4 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -3,10 +3,10 @@ package swarm
 import (
 	"testing"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/simul_test.go b/simul_test.go
index c6ee6cf985e35939389b78ed1c49f01d337e0e30..bc9cf3ae0f41d1d8c21eb893e1eae9ec4468f1e1 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -8,10 +8,10 @@ import (
 
 	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index 772413b286d7f8a1274c0915ada7123cc840f1cc..e221f7bc87a6181fa75e08172c1c7ad42182a789 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -7,9 +7,9 @@ import (
 	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/swarm_conn.go b/swarm_conn.go
index 762ba6e1d312758b4f82b1134a78547bbad1c068..40f5bdf0ab75ea7b1d89c4e233f073c43bf1daa7 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -6,11 +6,11 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 
+	"context"
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
-	context "golang.org/x/net/context"
 )
 
 // Conn is a simple wrapper around a ps.Conn that also exposes
diff --git a/swarm_listen.go b/swarm_listen.go
index 92ccd833af1b26cc1b24974b93f578df407d3496..e1b9a876fbad3ef218c134de55e039d705abd02e 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -3,6 +3,7 @@ package swarm
 import (
 	"fmt"
 
+	"context"
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
@@ -10,7 +11,6 @@ import (
 	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
-	context "golang.org/x/net/context"
 )
 
 func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
diff --git a/swarm_net.go b/swarm_net.go
index abf2f21ce02633d873437f1bcdc919b011a3fe7c..d9e83d5fdc02e3eaae5ae3ad01119c5a4f81562b 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -8,9 +8,9 @@ import (
 	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 
+	"context"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 4d564e3901fc2ee086e8d5fa8f71a856ba5ad99a..205b841a19ddac873e992781a482c369eef50023 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -7,7 +7,7 @@ import (
 
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
-	context "golang.org/x/net/context"
+	"context"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 06777469f5956f4f9347e812f7d0d693a2343179..2bc663e0a55666c6f0ceceee8b240b1d3aa20f18 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
 	inet "github.com/libp2p/go-libp2p/p2p/net"
-	context "golang.org/x/net/context"
 )
 
 func streamsSame(a, b inet.Stream) bool {
diff --git a/swarm_test.go b/swarm_test.go
index db8a4644237ac40ddbd2e17050cc20ddb43054ba..b7520dc757a318b6a7ad9e5ea644d7314714a45b 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -13,10 +13,10 @@ import (
 	inet "github.com/libp2p/go-libp2p/p2p/net"
 	testutil "github.com/libp2p/go-libp2p/testutil"
 
+	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func EchoStreamHandler(stream inet.Stream) {