diff --git a/plan9/syscall_test.go b/plan9/syscall_test.go
index 9b8c7dae..8f829bad 100644
--- a/plan9/syscall_test.go
+++ b/plan9/syscall_test.go
@@ -9,7 +9,7 @@ package plan9_test
 import (
 	"testing"
 
-	"code.google.com/p/go.sys/plan9"
+	"golang.org/x/sys/plan9"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {
diff --git a/unix/creds_test.go b/unix/creds_test.go
index 03485369..30694a0f 100644
--- a/unix/creds_test.go
+++ b/unix/creds_test.go
@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"testing"
 
-	"code.google.com/p/go.sys/unix"
+	"golang.org/x/sys/unix"
 )
 
 // TestSCMCredentials tests the sending and receiving of credentials
diff --git a/unix/mksyscall_solaris.pl b/unix/mksyscall_solaris.pl
index 68f3f6ab..e8ec976f 100755
--- a/unix/mksyscall_solaris.pl
+++ b/unix/mksyscall_solaris.pl
@@ -265,7 +265,7 @@ package $package
 import "unsafe"
 EOF
 
-print "import \"code.google.com/p/go.sys/unix\"\n" if $package ne "unix";
+print "import \"golang.org/x/sys/unix\"\n" if $package ne "unix";
 
 print <<EOF;
 
diff --git a/unix/mmap_unix_test.go b/unix/mmap_unix_test.go
index 5dfa75dd..04d5720f 100644
--- a/unix/mmap_unix_test.go
+++ b/unix/mmap_unix_test.go
@@ -9,7 +9,7 @@ package unix_test
 import (
 	"testing"
 
-	"code.google.com/p/go.sys/unix"
+	"golang.org/x/sys/unix"
 )
 
 func TestMmap(t *testing.T) {
diff --git a/unix/syscall_bsd_test.go b/unix/syscall_bsd_test.go
index 9c081d7f..55d88430 100644
--- a/unix/syscall_bsd_test.go
+++ b/unix/syscall_bsd_test.go
@@ -9,7 +9,7 @@ package unix_test
 import (
 	"testing"
 
-	"code.google.com/p/go.sys/unix"
+	"golang.org/x/sys/unix"
 )
 
 const MNT_WAIT = 1
diff --git a/unix/syscall_test.go b/unix/syscall_test.go
index 7306345c..9c57d9cd 100644
--- a/unix/syscall_test.go
+++ b/unix/syscall_test.go
@@ -9,7 +9,7 @@ package unix_test
 import (
 	"testing"
 
-	"code.google.com/p/go.sys/unix"
+	"golang.org/x/sys/unix"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {
diff --git a/unix/syscall_unix_test.go b/unix/syscall_unix_test.go
index 87f992aa..ad9a5d72 100644
--- a/unix/syscall_unix_test.go
+++ b/unix/syscall_unix_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/go.sys/unix"
+	"golang.org/x/sys/unix"
 )
 
 // Tests that below functions, structures and constants are consistent
diff --git a/windows/syscall_test.go b/windows/syscall_test.go
index e54a03cd..62588b91 100644
--- a/windows/syscall_test.go
+++ b/windows/syscall_test.go
@@ -9,7 +9,7 @@ package windows_test
 import (
 	"testing"
 
-	"code.google.com/p/go.sys/windows"
+	"golang.org/x/sys/windows"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {
diff --git a/windows/syscall_windows_test.go b/windows/syscall_windows_test.go
index 85500a67..0462bcf7 100644
--- a/windows/syscall_windows_test.go
+++ b/windows/syscall_windows_test.go
@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"testing"
 
-	"code.google.com/p/go.sys/windows"
+	"golang.org/x/sys/windows"
 )
 
 func TestWin32finddata(t *testing.T) {