diff --git a/.golangci.yml b/.golangci.yml
index f3ac5654a..2e9eb318d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -31,6 +31,9 @@ linters:
       - legacy
       - std-error-handling
   settings:
+    govet:
+      enable:
+        - nilness
     revive:
       rules:
         - name: blank-imports
diff --git a/plugin/dnstap/setup_test.go b/plugin/dnstap/setup_test.go
index ee0c24340..8aabc7eb1 100644
--- a/plugin/dnstap/setup_test.go
+++ b/plugin/dnstap/setup_test.go
@@ -111,7 +111,7 @@ func TestMultiDnstap(t *testing.T) {
 	handlers := dnsserver.GetConfig(c).Handlers()
 	d1, ok := handlers[0].(*Dnstap)
 	if !ok {
-		t.Fatalf("expected first plugin to be Dnstap, got %v", reflect.TypeOf(d1.Next))
+		t.Fatalf("expected first plugin to be Dnstap, got %v", reflect.TypeOf(handlers[0]))
 	}
 
 	if d1.io.(*dio).endpoint != "dnstap1.sock" {
diff --git a/plugin/forward/setup_test.go b/plugin/forward/setup_test.go
index ff3e2fad4..6a885b3d8 100644
--- a/plugin/forward/setup_test.go
+++ b/plugin/forward/setup_test.go
@@ -112,7 +112,6 @@ func TestSetupTLS(t *testing.T) {
 	for i, test := range tests {
 		c := caddy.NewTestController("dns", test.input)
 		fs, err := parseForward(c)
-		f := fs[0]
 
 		if test.shouldErr && err == nil {
 			t.Errorf("Test %d: expected error but found %s for input %s", i, err, test.input)
@@ -128,6 +127,8 @@ func TestSetupTLS(t *testing.T) {
 			}
 		}
 
+		f := fs[0]
+
 		if !test.shouldErr && test.expectedServerName != "" && test.expectedServerName != f.tlsConfig.ServerName {
 			t.Errorf("Test %d: expected: %q, actual: %q", i, test.expectedServerName, f.tlsConfig.ServerName)
 		}
@@ -314,7 +315,7 @@ func TestMultiForward(t *testing.T) {
 	handlers := dnsserver.GetConfig(c).Handlers()
 	f1, ok := handlers[0].(*Forward)
 	if !ok {
-		t.Fatalf("expected first plugin to be Forward, got %v", reflect.TypeOf(f1.Next))
+		t.Fatalf("expected first plugin to be Forward, got %v", reflect.TypeOf(handlers[0]))
 	}
 
 	if f1.from != "1st.example.org." {
diff --git a/plugin/transfer/notify.go b/plugin/transfer/notify.go
index 2198f583d..af5bada46 100644
--- a/plugin/transfer/notify.go
+++ b/plugin/transfer/notify.go
@@ -39,10 +39,11 @@ func (t *Transfer) Notify(zone string) error {
 
 func sendNotify(c *dns.Client, m *dns.Msg, s string) error {
 	var err error
+	var ret *dns.Msg
 
 	code := dns.RcodeServerFailure
 	for range 3 {
-		ret, _, err := c.Exchange(m, s)
+		ret, _, err = c.Exchange(m, s)
 		if err != nil {
 			continue
 		}
diff --git a/plugin/view/setup.go b/plugin/view/setup.go
index 2d409a0bd..874cb6ef2 100644
--- a/plugin/view/setup.go
+++ b/plugin/view/setup.go
@@ -52,9 +52,6 @@ func parse(c *caddy.Controller) (*View, error) {
 					return v, err
 				}
 				v.progs = append(v.progs, prog)
-				if err != nil {
-					return nil, err
-				}
 				continue
 			default:
 				return nil, c.Errf("unknown property '%s'", c.Val())