diff --git a/model/bootstrap/node_info_test.go b/model/bootstrap/node_info_test.go
index 506bc85d80f..fbe02d86569 100644
--- a/model/bootstrap/node_info_test.go
+++ b/model/bootstrap/node_info_test.go
@@ -2,7 +2,6 @@ package bootstrap_test
 
 import (
 	"encoding/json"
-	"github.com/onflow/flow-go/model/flow"
 	"strings"
 	"testing"
 
@@ -10,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/flow-go/model/bootstrap"
+	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/order"
 	"github.com/onflow/flow-go/utils/unittest"
 )
diff --git a/model/flow/identity.go b/model/flow/identity.go
index a368392f031..c2940f5bec2 100644
--- a/model/flow/identity.go
+++ b/model/flow/identity.go
@@ -9,9 +9,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/fxamacker/cbor/v2"
-	"github.com/onflow/flow-go/crypto"
 	"github.com/pkg/errors"
 	"github.com/vmihailenco/msgpack"
+
+	"github.com/onflow/flow-go/crypto"
 )
 
 // DefaultInitialWeight is the default initial weight for a node identity.
diff --git a/model/flow/order/identity_test.go b/model/flow/order/identity_test.go
index 191a6d9dc39..05c5704f515 100644
--- a/model/flow/order/identity_test.go
+++ b/model/flow/order/identity_test.go
@@ -3,11 +3,11 @@
 package order_test
 
 import (
-	"github.com/onflow/flow-go/model/flow"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/order"
 	"github.com/onflow/flow-go/utils/unittest"
 )
diff --git a/state/protocol/protocol_state/updater_test.go b/state/protocol/protocol_state/updater_test.go
index 0915926b597..3c3feab7a1b 100644
--- a/state/protocol/protocol_state/updater_test.go
+++ b/state/protocol/protocol_state/updater_test.go
@@ -1,7 +1,6 @@
 package protocol_state
 
 import (
-	"github.com/onflow/flow-go/model/flow/order"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -9,6 +8,7 @@ import (
 
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/mapfunc"
+	"github.com/onflow/flow-go/model/flow/order"
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
diff --git a/storage/badger/protocol_state_test.go b/storage/badger/protocol_state_test.go
index e6e54cf3ea0..62388c5b9a8 100644
--- a/storage/badger/protocol_state_test.go
+++ b/storage/badger/protocol_state_test.go
@@ -1,7 +1,6 @@
 package badger
 
 import (
-	"github.com/onflow/flow-go/model/flow/mapfunc"
 	"testing"
 
 	"github.com/dgraph-io/badger/v2"
@@ -9,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/model/flow/mapfunc"
 	"github.com/onflow/flow-go/module/metrics"
 	"github.com/onflow/flow-go/storage/badger/transaction"
 	"github.com/onflow/flow-go/utils/unittest"
diff --git a/utils/unittest/cluster.go b/utils/unittest/cluster.go
index 70ca17d5910..71eeb751655 100644
--- a/utils/unittest/cluster.go
+++ b/utils/unittest/cluster.go
@@ -2,6 +2,7 @@ package unittest
 
 import (
 	"fmt"
+
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/factory"
 	"github.com/onflow/flow-go/model/flow/filter"