diff --git a/PENDING.md b/PENDING.md
index 8a16136c0965..dca182fae558 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -43,7 +43,7 @@ IMPROVEMENTS
  - #2573 [x/distribution] add accum invariance
  - \#1924 [simulation] Use a transition matrix for block size
  - #2610 [x/stake] Block redelegation to and from the same validator
-
+ - #2652 [x/auth] Add benchmark for get and set account
 
 * Tendermint
 
diff --git a/x/auth/mapper_test.go b/x/auth/mapper_test.go
index 326f83dcca10..f1f4c7eaf9d9 100644
--- a/x/auth/mapper_test.go
+++ b/x/auth/mapper_test.go
@@ -3,15 +3,13 @@ package auth
 import (
 	"testing"
 
+	codec "github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/store"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
-
 	abci "github.com/tendermint/tendermint/abci/types"
 	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/libs/log"
-
-	codec "github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/store"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func setupMultiStore() (sdk.MultiStore, *sdk.KVStoreKey, *sdk.KVStoreKey) {
@@ -115,9 +113,92 @@ func BenchmarkAccountMapperGetAccountFound(b *testing.B) {
 		acc := mapper.NewAccountWithAddress(ctx, addr)
 		mapper.SetAccount(ctx, acc)
 	}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		arr := []byte{byte((i & 0xFF0000) >> 16), byte((i & 0xFF00) >> 8), byte(i & 0xFF)}
+		mapper.GetAccount(ctx, sdk.AccAddress(arr))
+	}
+}
+
+func BenchmarkAccountMapperGetAccountFoundWithCoins(b *testing.B) {
+	ms, capKey, _ := setupMultiStore()
+	cdc := codec.New()
+	RegisterBaseAccount(cdc)
+
+	// make context and mapper
+	ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
+	mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
+
+	coins := sdk.Coins{
+		sdk.NewCoin("LTC", sdk.NewInt(1000)),
+		sdk.NewCoin("BTC", sdk.NewInt(1000)),
+		sdk.NewCoin("ETH", sdk.NewInt(1000)),
+		sdk.NewCoin("XRP", sdk.NewInt(1000)),
+		sdk.NewCoin("BCH", sdk.NewInt(1000)),
+		sdk.NewCoin("EOS", sdk.NewInt(1000)),
+	}
+
+	// assumes b.N < 2**24
+	for i := 0; i < b.N; i++ {
+		arr := []byte{byte((i & 0xFF0000) >> 16), byte((i & 0xFF00) >> 8), byte(i & 0xFF)}
+		addr := sdk.AccAddress(arr)
+		acc := mapper.NewAccountWithAddress(ctx, addr)
+		acc.SetCoins(coins)
+		mapper.SetAccount(ctx, acc)
+	}
+
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		arr := []byte{byte((i & 0xFF0000) >> 16), byte((i & 0xFF00) >> 8), byte(i & 0xFF)}
 		mapper.GetAccount(ctx, sdk.AccAddress(arr))
 	}
 }
+
+func BenchmarkAccountMapperSetAccount(b *testing.B) {
+	ms, capKey, _ := setupMultiStore()
+	cdc := codec.New()
+	RegisterBaseAccount(cdc)
+
+	// make context and mapper
+	ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
+	mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
+
+	b.ResetTimer()
+	// assumes b.N < 2**24
+	for i := 0; i < b.N; i++ {
+		arr := []byte{byte((i & 0xFF0000) >> 16), byte((i & 0xFF00) >> 8), byte(i & 0xFF)}
+		addr := sdk.AccAddress(arr)
+		acc := mapper.NewAccountWithAddress(ctx, addr)
+		mapper.SetAccount(ctx, acc)
+	}
+}
+
+func BenchmarkAccountMapperSetAccountWithCoins(b *testing.B) {
+	ms, capKey, _ := setupMultiStore()
+	cdc := codec.New()
+	RegisterBaseAccount(cdc)
+
+	// make context and mapper
+	ctx := sdk.NewContext(ms, abci.Header{}, false, log.NewNopLogger())
+	mapper := NewAccountKeeper(cdc, capKey, ProtoBaseAccount)
+
+	coins := sdk.Coins{
+		sdk.NewCoin("LTC", sdk.NewInt(1000)),
+		sdk.NewCoin("BTC", sdk.NewInt(1000)),
+		sdk.NewCoin("ETH", sdk.NewInt(1000)),
+		sdk.NewCoin("XRP", sdk.NewInt(1000)),
+		sdk.NewCoin("BCH", sdk.NewInt(1000)),
+		sdk.NewCoin("EOS", sdk.NewInt(1000)),
+	}
+
+	b.ResetTimer()
+	// assumes b.N < 2**24
+	for i := 0; i < b.N; i++ {
+		arr := []byte{byte((i & 0xFF0000) >> 16), byte((i & 0xFF00) >> 8), byte(i & 0xFF)}
+		addr := sdk.AccAddress(arr)
+		acc := mapper.NewAccountWithAddress(ctx, addr)
+		acc.SetCoins(coins)
+		mapper.SetAccount(ctx, acc)
+	}
+}