diff --git a/lnd_test.go b/lnd_test.go
index 94d98a1ab..133bc78f4 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -2,13 +2,14 @@ package main
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"runtime/debug"
 	"strings"
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/roasbeef/btcd/rpctest"
 	"github.com/roasbeef/btcd/wire"
diff --git a/networkharness.go b/networkharness.go
index 758d3d736..23bed010b 100644
--- a/networkharness.go
+++ b/networkharness.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"encoding/hex"
 	"fmt"
 	"io/ioutil"
@@ -14,6 +13,8 @@ import (
 	"strconv"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/grpclog"