diff --git a/attest/attest_simulated_tpm20_test.go b/attest/attest_simulated_tpm20_test.go
index f693320..68c16e9 100644
--- a/attest/attest_simulated_tpm20_test.go
+++ b/attest/attest_simulated_tpm20_test.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/google/certificate-transparency-go/x509"
 
-	"github.com/google/go-tpm/tpm2/credactivation"
-	"github.com/google/go-tpm/tpm2"
 	"github.com/google/go-tpm-tools/simulator"
+	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/tpm2/credactivation"
 )
 
 func setupSimulatedTPM(t *testing.T) (*simulator.Simulator, *TPM) {
diff --git a/attest/attest_test.go b/attest/attest_test.go
index 0c47e3f..d2000bb 100644
--- a/attest/attest_test.go
+++ b/attest/attest_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/google/certificate-transparency-go/x509"
 
-	"github.com/google/go-tpm/tpm2/credactivation"
 	"github.com/google/go-tpm/tpm2"
+	"github.com/google/go-tpm/tpm2/credactivation"
 )
 
 func TestOpen(t *testing.T) {
diff --git a/attest/pcp_windows.go b/attest/pcp_windows.go
index 7176d79..6fed3c1 100644
--- a/attest/pcp_windows.go
+++ b/attest/pcp_windows.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/google/certificate-transparency-go/x509"
 
-	"golang.org/x/sys/windows"
-	tpmtbs "github.com/google/go-tpm/tpmutil/tbs"
 	"github.com/google/go-tpm/tpmutil"
+	tpmtbs "github.com/google/go-tpm/tpmutil/tbs"
+	"golang.org/x/sys/windows"
 )
 
 const (