diff --git a/consensus/state_test.go b/consensus/state_test.go
index f4d79ca77..d0def6309 100644
--- a/consensus/state_test.go
+++ b/consensus/state_test.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	cstypes "github.com/tendermint/tendermint/consensus/types"
+	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 	"github.com/tendermint/tendermint/types"
 	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/tmlibs/log"
-	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 )
 
 func init() {
diff --git a/rpc/client/httpclient.go b/rpc/client/httpclient.go
index e25cac1f5..1414edce3 100644
--- a/rpc/client/httpclient.go
+++ b/rpc/client/httpclient.go
@@ -7,11 +7,11 @@ import (
 	"github.com/pkg/errors"
 
 	amino "github.com/tendermint/go-amino"
+	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	rpcclient "github.com/tendermint/tendermint/rpc/lib/client"
 	"github.com/tendermint/tendermint/types"
 	cmn "github.com/tendermint/tmlibs/common"
-	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 )
 
 /*
diff --git a/rpc/client/localclient.go b/rpc/client/localclient.go
index d3eeb4261..d89ec3b22 100644
--- a/rpc/client/localclient.go
+++ b/rpc/client/localclient.go
@@ -3,12 +3,12 @@ package client
 import (
 	"context"
 
+	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 	nm "github.com/tendermint/tendermint/node"
 	"github.com/tendermint/tendermint/rpc/core"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 	cmn "github.com/tendermint/tmlibs/common"
-	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 )
 
 /*
diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go
index bf7760fc8..ab509f965 100644
--- a/state/txindex/indexer.go
+++ b/state/txindex/indexer.go
@@ -3,8 +3,8 @@ package txindex
 import (
 	"errors"
 
-	"github.com/tendermint/tendermint/types"
 	"github.com/tendermint/tendermint/libs/pubsub/query"
+	"github.com/tendermint/tendermint/types"
 )
 
 // TxIndexer interface defines methods to index and search transactions.
diff --git a/state/txindex/null/null.go b/state/txindex/null/null.go
index 2d3961e6b..f85de2e6f 100644
--- a/state/txindex/null/null.go
+++ b/state/txindex/null/null.go
@@ -3,9 +3,9 @@ package null
 import (
 	"errors"
 
+	"github.com/tendermint/tendermint/libs/pubsub/query"
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tendermint/libs/pubsub/query"
 )
 
 var _ txindex.TxIndexer = (*TxIndex)(nil)
diff --git a/types/event_bus.go b/types/event_bus.go
index 2bc339da7..7480c8240 100644
--- a/types/event_bus.go
+++ b/types/event_bus.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/tmlibs/log"
-	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 )
 
 const defaultCapacity = 1000
diff --git a/types/event_bus_test.go b/types/event_bus_test.go
index 8358ad261..d9b0995b9 100644
--- a/types/event_bus_test.go
+++ b/types/event_bus_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/tmlibs/common"
 	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
 	tmquery "github.com/tendermint/tendermint/libs/pubsub/query"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func TestEventBusPublishEventTx(t *testing.T) {