diff --git a/plugin/cache/item.go b/plugin/cache/item.go
index bda5fe746..3b47a3b6b 100644
--- a/plugin/cache/item.go
+++ b/plugin/cache/item.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/coredns/coredns/plugin/cache/freq"
+
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/dnstap/handler_test.go b/plugin/dnstap/handler_test.go
index e8a0d7020..74f72521d 100644
--- a/plugin/dnstap/handler_test.go
+++ b/plugin/dnstap/handler_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/coredns/coredns/plugin/dnstap/msg"
 	test "github.com/coredns/coredns/plugin/test"
+
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )
diff --git a/plugin/dnstap/writer.go b/plugin/dnstap/writer.go
index b9a277319..177263496 100644
--- a/plugin/dnstap/writer.go
+++ b/plugin/dnstap/writer.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/coredns/coredns/plugin/dnstap/msg"
+
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )
diff --git a/plugin/kubernetes/parse.go b/plugin/kubernetes/parse.go
index b5801a42e..a7cd36ba6 100644
--- a/plugin/kubernetes/parse.go
+++ b/plugin/kubernetes/parse.go
@@ -2,6 +2,7 @@ package kubernetes
 
 import (
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
+
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/normalize.go b/plugin/normalize.go
index dea7d6723..56b086fcd 100644
--- a/plugin/normalize.go
+++ b/plugin/normalize.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/coredns/coredns/plugin/pkg/parse"
+
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/pkg/trace/trace.go b/plugin/pkg/trace/trace.go
index 35a8ddabd..6585d8051 100644
--- a/plugin/pkg/trace/trace.go
+++ b/plugin/pkg/trace/trace.go
@@ -2,6 +2,7 @@ package trace
 
 import (
 	"github.com/coredns/coredns/plugin"
+
 	ot "github.com/opentracing/opentracing-go"
 )
 
diff --git a/test/presubmit_test.go b/test/presubmit_test.go
index 5d519d759..903661ba0 100644
--- a/test/presubmit_test.go
+++ b/test/presubmit_test.go
@@ -293,7 +293,7 @@ func (w *testImportOrderingWalker) walk(path string, info os.FileInfo, _ error)
 
 	// Ok, now that we have the type, let's see if all members adhere to it.
 	// After that we check if the are in the right order.
-	for i := 0; i < bl; i++ {
+	for i := 0; i <= bl; i++ {
 		for _, p := range blocks[i] {
 			t := importtype(p.Path.Value)
 			if t != ip[i] {