diff --git a/glide.lock b/glide.lock
index 79455dd71..d69aacb06 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: b4e6f2f40e2738e45cec07ed91a5733d94d29cdfa0c7eb686a4d0a34512e2097
-updated: 2017-11-30T17:46:14.710809367Z
+hash: 8c38726da2666831affa40474117d3cef5dad083176e81fb013d7e8493b83e6f
+updated: 2017-12-01T02:14:22.08770964Z
 imports:
 - name: github.com/btcsuite/btcd
   version: 8cea3866d0f7fb12d567a20744942c0d078c7d15
@@ -98,7 +98,7 @@ imports:
   - leveldb/table
   - leveldb/util
 - name: github.com/tendermint/abci
-  version: 5c29adc081795b04f9d046fb51d76903c22cfa6d
+  version: 22b491bb1952125dd2fb0730d6ca8e59e310547c
   subpackages:
   - client
   - example/counter
@@ -113,7 +113,7 @@ imports:
 - name: github.com/tendermint/go-crypto
   version: dd20358a264c772b4a83e477b0cfce4c88a7001d
 - name: github.com/tendermint/go-wire
-  version: 7d50b38b3815efe313728de77e2995c8813ce13f
+  version: 5ab49b4c6ad674da6b81442911cf713ef0afb544
   subpackages:
   - data
   - data/base58
diff --git a/glide.yaml b/glide.yaml
index 9d37891dd..18f0dae8d 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -18,7 +18,7 @@ import:
 - package: github.com/spf13/viper
   version: v1.0.0
 - package: github.com/tendermint/abci
-  version: develop
+  version: 22b491bb1952125dd2fb0730d6ca8e59e310547c
   subpackages:
   - client
   - example/dummy
diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go
index e55f4887d..ce63df9e1 100644
--- a/state/txindex/kv/kv_test.go
+++ b/state/txindex/kv/kv_test.go
@@ -46,8 +46,8 @@ func TestTxIndex(t *testing.T) {
 }
 
 func TestTxSearch(t *testing.T) {
-	tags := []string{"account.number", "account.owner", "account.date"}
-	indexer := NewTxIndex(db.NewMemDB(), IndexTags(tags))
+	allowedTags := []string{"account.number", "account.owner", "account.date"}
+	indexer := NewTxIndex(db.NewMemDB(), IndexTags(allowedTags))
 
 	tx := types.Tx("HELLO WORLD")
 	tags := []*abci.KVPair{
@@ -105,8 +105,8 @@ func TestTxSearch(t *testing.T) {
 }
 
 func TestTxSearchOneTxWithMultipleSameTagsButDifferentValues(t *testing.T) {
-	tags := []string{"account.number"}
-	indexer := NewTxIndex(db.NewMemDB(), IndexTags(tags))
+	allowedTags := []string{"account.number"}
+	indexer := NewTxIndex(db.NewMemDB(), IndexTags(allowedTags))
 
 	tx := types.Tx("SAME MULTIPLE TAGS WITH DIFFERENT VALUES")
 	tags := []*abci.KVPair{