diff --git a/client/client_test.go b/client/client_test.go
index 204f70d28..7c3f3f408 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -21,8 +21,8 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	nconfig "github.com/hashicorp/nomad/nomad/structs/config"
 	"github.com/hashicorp/nomad/plugins/device"
-	"github.com/hashicorp/nomad/pluginutils/catalog"
 	psstructs "github.com/hashicorp/nomad/plugins/shared/structs"
+	"github.com/hashicorp/nomad/pluginutils/catalog"
 	"github.com/hashicorp/nomad/testutil"
 	"github.com/stretchr/testify/assert"
 
diff --git a/client/devicemanager/manager_test.go b/client/devicemanager/manager_test.go
index 5ae8eea7f..a72fdb882 100644
--- a/client/devicemanager/manager_test.go
+++ b/client/devicemanager/manager_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/plugins/base"
 	"github.com/hashicorp/nomad/plugins/device"
-	"github.com/hashicorp/nomad/pluginutils/loader"
 	psstructs "github.com/hashicorp/nomad/plugins/shared/structs"
+	"github.com/hashicorp/nomad/pluginutils/loader"
 	"github.com/hashicorp/nomad/testutil"
 	"github.com/stretchr/testify/require"
 )
diff --git a/drivers/mock/driver.go b/drivers/mock/driver.go
index 45a87ec67..e5053b394 100644
--- a/drivers/mock/driver.go
+++ b/drivers/mock/driver.go
@@ -16,8 +16,8 @@ import (
 	"github.com/hashicorp/nomad/plugins/base"
 	"github.com/hashicorp/nomad/plugins/drivers"
 	"github.com/hashicorp/nomad/plugins/shared/hclspec"
-	"github.com/hashicorp/nomad/pluginutils/loader"
 	pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
+	"github.com/hashicorp/nomad/pluginutils/loader"
 )
 
 const (
diff --git a/plugins/base/client.go b/plugins/base/client.go
index 94128a291..dd0f728d7 100644
--- a/plugins/base/client.go
+++ b/plugins/base/client.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/nomad/plugins/base/proto"
-	"github.com/hashicorp/nomad/pluginutils/grpcutils"
 	"github.com/hashicorp/nomad/plugins/shared/hclspec"
+	"github.com/hashicorp/nomad/pluginutils/grpcutils"
 )
 
 // BasePluginClient implements the client side of a remote base plugin, using
diff --git a/plugins/drivers/client.go b/plugins/drivers/client.go
index 7f09c555f..899c2f85f 100644
--- a/plugins/drivers/client.go
+++ b/plugins/drivers/client.go
@@ -13,10 +13,10 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/plugins/base"
 	"github.com/hashicorp/nomad/plugins/drivers/proto"
-	"github.com/hashicorp/nomad/pluginutils/grpcutils"
 	"github.com/hashicorp/nomad/plugins/shared/hclspec"
 	pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
 	sproto "github.com/hashicorp/nomad/plugins/shared/structs/proto"
+	"github.com/hashicorp/nomad/pluginutils/grpcutils"
 	"google.golang.org/grpc/status"
 )