diff --git a/gddo-server/logging.go b/gddo-server/logging.go
index c80c39d..20490b2 100644
--- a/gddo-server/logging.go
+++ b/gddo-server/logging.go
@@ -13,8 +13,8 @@
 	"net/http"
 	"time"
 
+	"cloud.google.com/go/logging"
 	"github.com/golang/gddo/database"
-	"google.golang.org/cloud/logging"
 )
 
 // newGCELogger returns a handler that wraps h but logs each request
diff --git a/gddo-server/main.go b/gddo-server/main.go
index 43fecf8..4f69574 100644
--- a/gddo-server/main.go
+++ b/gddo-server/main.go
@@ -29,10 +29,10 @@
 	"strings"
 	"time"
 
+	"cloud.google.com/go/compute/metadata"
+	"cloud.google.com/go/logging"
 	"golang.org/x/net/context"
 	"google.golang.org/appengine"
-	"google.golang.org/cloud/compute/metadata"
-	"google.golang.org/cloud/logging"
 
 	"github.com/golang/gddo/database"
 	"github.com/golang/gddo/doc"
diff --git a/httputil/static_test.go b/httputil/static_test.go
index 111b9a4..687bfdc 100644
--- a/httputil/static_test.go
+++ b/httputil/static_test.go
@@ -9,7 +9,6 @@
 import (
 	"crypto/sha1"
 	"encoding/hex"
-	"github.com/golang/gddo/httputil"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -19,6 +18,8 @@
 	"strconv"
 	"testing"
 	"time"
+
+	"github.com/golang/gddo/httputil"
 )
 
 var (
diff --git a/httputil/transport.go b/httputil/transport.go
index 2988a3c..81af99d 100644
--- a/httputil/transport.go
+++ b/httputil/transport.go
@@ -15,7 +15,7 @@
 	"net/url"
 	"os"
 
-	"google.golang.org/cloud/compute/metadata"
+	"cloud.google.com/go/compute/metadata"
 )
 
 // AuthTransport is an implementation of http.RoundTripper that authenticates