diff --git a/tests/test_app/app.go b/tests/test_app/app.go
index ab7947690..7fc3ace0a 100644
--- a/tests/test_app/app.go
+++ b/tests/test_app/app.go
@@ -57,7 +57,7 @@ func setOption(client abcicli.Client, key, value string) {
 
 func commit(client abcicli.Client, hashExp []byte) {
 	res := client.CommitSync()
-	_, data, log := res.Code, res.Data, res.Log
+	_, data, _ := res.Code, res.Data, res.Log
 	if res.IsErr() {
 		panic(fmt.Sprintf("committing err %v\n", res))
 	}
diff --git a/types/application.go b/types/application.go
index 8f17bf502..b596685c8 100644
--- a/types/application.go
+++ b/types/application.go
@@ -1,4 +1,4 @@
-package types
+package types // nolint: goimports
 
 import (
 	context "golang.org/x/net/context"
@@ -18,7 +18,7 @@ type Application interface {
 	// Consensus Connection
 	InitChain(RequestInitChain)              // Initialize blockchain with validators and other info from TendermintCore
 	BeginBlock(RequestBeginBlock)            // Signals the beginning of a block
-	DeliverTx(tx []byte) Result            // Deliver a tx for full processing
+	DeliverTx(tx []byte) Result              // Deliver a tx for full processing
 	EndBlock(height uint64) ResponseEndBlock // Signals the end of a block, returns changes to the validator set
 	Commit() Result                          // Commit the state and return the application Merkle root hash
 }