diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go
index d7825c0a1..f477e5dc0 100644
--- a/consensus/wal_generator.go
+++ b/consensus/wal_generator.go
@@ -33,6 +33,7 @@ func WALWithNBlocks(numBlocks int) (data []byte, err error) {
 	app := dummy.NewPersistentDummyApplication(filepath.Join(config.DBDir(), "wal_generator"))
 
 	logger := log.TestingLogger().With("wal_generator", "wal_generator")
+	logger.Info("generating WAL (last height msg excluded)", "numBlocks", numBlocks)
 
 	/////////////////////////////////////////////////////////////////////////////
 	// COPY PASTE FROM node.go WITH A FEW MODIFICATIONS
@@ -63,6 +64,7 @@ func WALWithNBlocks(numBlocks int) (data []byte, err error) {
 	if err := eventBus.Start(); err != nil {
 		return nil, errors.Wrap(err, "failed to start event bus")
 	}
+	defer eventBus.Stop()
 	mempool := types.MockMempool{}
 	consensusState := NewConsensusState(config.Consensus, state.Copy(), proxyApp.Consensus(), blockStore, mempool)
 	consensusState.SetLogger(logger)