diff --git a/examples_test.go b/examples_test.go
index 1fc9dcf3a3..e7ed12abb6 100644
--- a/examples_test.go
+++ b/examples_test.go
@@ -19,8 +19,9 @@ package qemu_test
 import (
 	"time"
 
+	"context"
+
 	"github.com/01org/ciao/qemu"
-	"golang.org/x/net/context"
 )
 
 func Example() {
diff --git a/qemu.go b/qemu.go
index 6014d36a9e..4fe3b2b932 100644
--- a/qemu.go
+++ b/qemu.go
@@ -29,7 +29,7 @@ import (
 	"os"
 	"os/exec"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // LaunchQemu can be used to launch a new qemu instance by invoking the
diff --git a/qmp.go b/qmp.go
index 0634552fe7..bc2596823b 100644
--- a/qmp.go
+++ b/qmp.go
@@ -26,7 +26,7 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // QMPLog is a logging interface used by the qemu package to log various
diff --git a/qmp_test.go b/qmp_test.go
index 9519a176ee..4d60c0099b 100644
--- a/qmp_test.go
+++ b/qmp_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/01org/ciao/testutil"
 )