diff --git a/glide.lock b/glide.lock
index 592df5a97..c1bf21c14 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 7b6edafcc8b8aad7c697bf745121afa3ae37402d8ae3e8f6193d1fabed619997
-updated: 2017-06-23T22:11:01.311106426-04:00
+hash: 2c988aae9517b386ee911e4da5deb9f5034359b7e2ccf448952a3ddb9771222d
+updated: 2017-06-28T13:04:20.907047164+02:00
 imports:
 - name: github.com/btcsuite/btcd
   version: b8df516b4b267acf2de46be593a9d948d1d2c420
@@ -58,9 +58,9 @@ imports:
 - name: github.com/pelletier/go-buffruneio
   version: c37440a7cf42ac63b919c752ca73a85067e05992
 - name: github.com/pelletier/go-toml
-  version: 5c26a6ff6fd178719e15decac1c8196da0d7d6d1
+  version: 5ccdfb18c776b740aecaf085c4d9a2779199c279
 - name: github.com/pkg/errors
-  version: ff09b135c25aae272398c51a07235b90a75aa4f0
+  version: 645ef00459ed84a119197bfb8d8205042c6df63d
 - name: github.com/spf13/afero
   version: 9be650865eab0c12963d8753212f4f9c66cdcf12
   subpackages:
@@ -75,11 +75,6 @@ imports:
   version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
 - name: github.com/spf13/viper
   version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2
-- name: github.com/stretchr/testify
-  version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
-  subpackages:
-  - assert
-  - require
 - name: github.com/syndtr/goleveldb
   version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4
   subpackages:
@@ -109,14 +104,14 @@ imports:
   - edwards25519
   - extra25519
 - name: github.com/tendermint/go-crypto
-  version: 7dff40942a64cdeefefa9446b2d104750b349f8a
+  version: 95b7c9e09c49b91bfbb71bb63dd514eb55450f16
 - name: github.com/tendermint/go-wire
   version: 5f88da3dbc1a72844e6dfaf274ce87f851d488eb
   subpackages:
   - data
   - data/base58
 - name: github.com/tendermint/merkleeyes
-  version: ce7de05896f560ddcc9207f65fea9901835dd238
+  version: 102aaf5a8ffda1846413fb22805a94def2045b9f
   subpackages:
   - app
   - client
@@ -199,3 +194,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 705079ceb..9bf95b508 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -7,13 +7,13 @@ import:
 - package: github.com/golang/protobuf
   subpackages:
   - proto
+- package: github.com/pelletier/go-toml
+  version: ^1.0.0
 - package: github.com/gorilla/websocket
 - package: github.com/pkg/errors
+  version: ~0.8.0
 - package: github.com/spf13/cobra
 - package: github.com/spf13/viper
-- package: github.com/stretchr/testify
-  subpackages:
-  - require
 - package: github.com/tendermint/abci
   version: v0.5.0
   subpackages:
@@ -21,13 +21,19 @@ import:
   - example/dummy
   - types
 - package: github.com/tendermint/go-crypto
-  version: v0.2.0
+  version: ~0.2.2
 - package: github.com/tendermint/go-wire
-  version: v0.6.2
+  version: ~0.6.2
   subpackages:
   - data
+- package: github.com/tendermint/merkleeyes
+  version: ~0.2.4
+  subpackages:
+  - app
+  - iavl
+  - testutil
 - package: github.com/tendermint/tmlibs
-  version: v0.2.2
+  version: ~0.2.2
   subpackages:
   - autofile
   - cli
@@ -48,9 +54,7 @@ import:
   - context
 - package: google.golang.org/grpc
 testImport:
-- package: github.com/tendermint/merkleeyes
-  version: v0.2.4
+- package: github.com/stretchr/testify
   subpackages:
-  - app
-  - iavl
-  - testutil
+  - assert
+  - require