diff --git a/glide.lock b/glide.lock
index 7a39a3b4e..8aa89abaf 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: a0dd8fe3cb061f9e4f3b3b6f0e6e7fb91982d7c3deb422e53e144a3bdcde216a
-updated: 2017-04-21T18:24:13.217717865-04:00
+hash: 13c7dac029851e5177bf78ff26ce6ccd047360111795a9a65af4ba6a0b87f4b3
+updated: 2017-04-21T18:31:57.13123527-04:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 583684b21bfbde9b5fc4403916fd7c807feb0289
@@ -21,11 +21,6 @@ imports:
   version: 30a891c33c7cde7b02a981314b4228ec99380cca
 - name: github.com/pkg/errors
   version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/stretchr/testify
-  version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
-  subpackages:
-  - assert
-  - require
 - name: github.com/syndtr/goleveldb
   version: 23851d93a2292dcc56e71a18ec9e0624d84a0f65
   subpackages:
@@ -46,20 +41,8 @@ imports:
   subpackages:
   - edwards25519
   - extra25519
-- name: github.com/tendermint/tmlibs/common
-  version: f9e3db037330c8a8d61d3966de8473eaf01154fa
 - name: github.com/tendermint/go-crypto
   version: 9b95da8fa4187f6799558d89b271dc8ab6485615
-- name: github.com/tendermint/go-wire/data
-  version: e7fcc6d081ec8518912fcdc103188275f83a3ee5
-- name: github.com/tendermint/tmlibs/db
-  version: 9643f60bc2578693844aacf380a7c32e4c029fee
-- name: github.com/tendermint/tmlibs/logger
-  version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
-- name: github.com/tendermint/go-merkle
-  version: 714d4d04557fd068a7c2a1748241ce8428015a96
-- name: github.com/tendermint/tmlibs/process
-  version: b27edfd189b1a01a0b099f7e9f8263589cf04909
 - name: github.com/tendermint/go-wire
   version: 334005c236d19c632fb5f073f9de3b0fab6a522b
   subpackages:
@@ -68,11 +51,18 @@ imports:
   version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6
   subpackages:
   - term
+- name: github.com/tendermint/merkleeyes
+  version: 41fe51f4a6d3f1abc45fd4684e1351e084860ca4
+  subpackages:
+  - iavl
 - name: github.com/tendermint/tmlibs
   version: df250b69416a35a943a6e2a92118667e9ef031d4
   subpackages:
   - common
+  - db
   - logger
+  - merkle
+  - process
 - name: github.com/urfave/cli
   version: 0bdeddeeb0f650497d603c4ad7b20cfe685682f6
 - name: golang.org/x/crypto
@@ -120,3 +110,8 @@ testImports:
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
   subpackages:
   - difflib
+- name: github.com/stretchr/testify
+  version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
+  subpackages:
+  - assert
+  - require
diff --git a/glide.yaml b/glide.yaml
index cf909175f..2876b0e51 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,27 +3,28 @@ import:
 - package: github.com/golang/protobuf
   subpackages:
   - proto
-- package: github.com/tendermint/tmlibs/common
-  version: develop
 - package: github.com/tendermint/go-crypto
   version: develop
-- package: github.com/tendermint/go-wire/data
-  version: develop
-- package: github.com/tendermint/tmlibs/logger
-  version: develop
-- package: github.com/tendermint/tmlibs/db
+- package: github.com/tendermint/go-wire
   version: develop
-- package: github.com/tendermint/go-merkle
+- package: github.com/tendermint/merkleeyes
   version: develop
-- package: github.com/tendermint/tmlibs/process
-- package: github.com/tendermint/go-wire
+  subpackages:
+  - iavl
+- package: github.com/tendermint/tmlibs
   version: develop
+  subpackages:
+  - common
+  - db
+  - logger
+  - merkle
+  - process
 - package: github.com/urfave/cli
 - package: golang.org/x/net
   subpackages:
   - context
 - package: google.golang.org/grpc
+testImport:
 - package: github.com/stretchr/testify
-  version: ^1.1.4
   subpackages:
   - require