diff --git a/README.md b/README.md
index 8e68ca7..b3bc02f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![GoDoc](https://godoc.org/github.com/alexflint/go-arg?status.svg)](https://godoc.org/github.com/alexflint/go-arg)
 [![Build Status](https://travis-ci.org/alexflint/go-arg.svg?branch=master)](https://travis-ci.org/alexflint/go-arg)
+[![GolangCI](https://golangci.com/badges/github.com/alexflint/go-arg.svg)](https://golangci.com/r/github.com/alexflint/go-arg)
 [![Coverage Status](https://coveralls.io/repos/alexflint/go-arg/badge.svg?branch=master&service=github)](https://coveralls.io/github/alexflint/go-arg?branch=master)
 [![Report Card](https://goreportcard.com/badge/github.com/alexflint/go-arg)](https://goreportcard.com/badge/github.com/alexflint/go-arg)
 
diff --git a/parse_test.go b/parse_test.go
index b72563c..2e438aa 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -458,14 +458,14 @@ func TestHelpFlag(t *testing.T) {
 func TestPanicOnNonPointer(t *testing.T) {
 	var args struct{}
 	assert.Panics(t, func() {
-		parse("", args)
+		_ = parse("", args)
 	})
 }
 
 func TestPanicOnNonStruct(t *testing.T) {
 	var args string
 	assert.Panics(t, func() {
-		parse("", &args)
+		_ = parse("", &args)
 	})
 }
 
diff --git a/test/some-program/main.go b/test/some-program/main.go
index bc6140f..34c6077 100644
--- a/test/some-program/main.go
+++ b/test/some-program/main.go
@@ -7,4 +7,5 @@ func main() {
 		Test string
 	}
 	arg.MustParse(&args)
+	_ = args.Test
 }
diff --git a/usage_test.go b/usage_test.go
index 4f179f0..fc0b8c5 100644
--- a/usage_test.go
+++ b/usage_test.go
@@ -2,14 +2,14 @@ package arg
 
 import (
 	"bytes"
+	"errors"
+	"fmt"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"strings"
-	"fmt"
-	"errors"
 )
 
 type NameDotName struct {
@@ -56,16 +56,16 @@ Options:
   --help, -h             display this help and exit
 `
 	var args struct {
-		Input    string    `arg:"positional"`
-		Output   []string  `arg:"positional" help:"list of outputs"`
-		Name     string    `help:"name to use"`
-		Value    int       `help:"secret value"`
-		Verbose  bool      `arg:"-v" help:"verbosity level"`
-		Dataset  string    `help:"dataset to use"`
-		Optimize int       `arg:"-O" help:"optimization level"`
-		Ids      []int64   `help:"Ids"`
-		Values   []float64 `help:"Values"`
-		Workers  int       `arg:"-w,env:WORKERS" help:"number of workers to start"`
+		Input    string       `arg:"positional"`
+		Output   []string     `arg:"positional" help:"list of outputs"`
+		Name     string       `help:"name to use"`
+		Value    int          `help:"secret value"`
+		Verbose  bool         `arg:"-v" help:"verbosity level"`
+		Dataset  string       `help:"dataset to use"`
+		Optimize int          `arg:"-O" help:"optimization level"`
+		Ids      []int64      `help:"Ids"`
+		Values   []float64    `help:"Values"`
+		Workers  int          `arg:"-w,env:WORKERS" help:"number of workers to start"`
 		File     *NameDotName `arg:"-f" help:"File with mandatory extension"`
 	}
 	args.Name = "Foo Bar"
@@ -89,15 +89,11 @@ Options:
 type MyEnum int
 
 func (n *MyEnum) UnmarshalText(b []byte) error {
-	b = []byte("Hello")
 	return nil
 }
 
-func (n *MyEnum) MarshalText() (text []byte, err error) {
-	s := "There was a problem"
-	text = []byte(s)
-	err = errors.New(s)
-	return
+func (n *MyEnum) MarshalText() ([]byte, error) {
+	return nil, errors.New("There was a problem")
 }
 
 func TestUsageError(t *testing.T) {