diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go
index e55dcf3e..6bfdfda9 100644
--- a/consensus/mempool_test.go
+++ b/consensus/mempool_test.go
@@ -81,15 +81,12 @@ func TestRmBadTx(t *testing.T) {
 		// check for the tx
 		for {
 			time.Sleep(time.Second)
-			select {
-			case <-ch:
-			default:
-				txs := cs.mempool.Reap(1)
-				if len(txs) == 0 {
-					ch <- struct{}{}
-				}
-
+			txs := cs.mempool.Reap(1)
+			if len(txs) == 0 {
+				ch <- struct{}{}
+				return
 			}
+
 		}
 	}()
 
diff --git a/glide.lock b/glide.lock
index a72ced40..a3ce63dd 100644
--- a/glide.lock
+++ b/glide.lock
@@ -79,7 +79,7 @@ imports:
 - name: github.com/tendermint/go-clist
   version: 3baa390bbaf7634251c42ad69a8682e7e3990552
 - name: github.com/tendermint/go-common
-  version: 6141dc6eedab067f7e25707a237218ef2c0dc273
+  version: dcb015dff6c7af21e65c8e2f3b450df19d38c777
   subpackages:
   - test
 - name: github.com/tendermint/go-config