6 files changed, 8 insertions, 12 deletions
diff --git a/plugin/etcd/etcd.go b/plugin/etcd/etcd.go
index 2887b041e..fc4542bfe 100644
--- a/plugin/etcd/etcd.go
+++ b/plugin/etcd/etcd.go
@@ -2,6 +2,7 @@
 package etcd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -13,8 +14,6 @@ import (
 	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"
diff --git a/plugin/etcd/handler.go b/plugin/etcd/handler.go
index fa1a14e82..ebd73d946 100644
--- a/plugin/etcd/handler.go
+++ b/plugin/etcd/handler.go
@@ -1,12 +1,12 @@
 package etcd
 
 import (
+	"context"
+
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/dnsutil"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/etcd/lookup_test.go b/plugin/etcd/lookup_test.go
index 2779d720b..934140367 100644
--- a/plugin/etcd/lookup_test.go
+++ b/plugin/etcd/lookup_test.go
@@ -3,6 +3,7 @@
 package etcd
 
 import (
+	"context"
 	"encoding/json"
 	"testing"
 	"time"
@@ -14,8 +15,6 @@ import (
 	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/plugin/test"
 
-	"context"
-
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/miekg/dns"
 )
diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go
index 68365a03d..6b83ebc37 100644
--- a/plugin/etcd/setup.go
+++ b/plugin/etcd/setup.go
@@ -1,6 +1,7 @@
 package etcd
 
 import (
+	"context"
 	"crypto/tls"
 
 	"github.com/coredns/coredns/core/dnsserver"
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/upstream"
 	"github.com/coredns/coredns/plugin/proxy"
 
-	"context"
-
 	etcdc "github.com/coreos/etcd/client"
 	"github.com/mholt/caddy"
 )
diff --git a/plugin/etcd/stub_handler.go b/plugin/etcd/stub_handler.go
index 637d2891a..92a0103c5 100644
--- a/plugin/etcd/stub_handler.go
+++ b/plugin/etcd/stub_handler.go
@@ -1,13 +1,12 @@
 package etcd
 
 import (
+	"context"
 	"errors"
 
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/etcd/xfr.go b/plugin/etcd/xfr.go
index bf4ab95d6..358ff7a38 100644
--- a/plugin/etcd/xfr.go
+++ b/plugin/etcd/xfr.go
@@ -1,11 +1,11 @@
 package etcd
 
 import (
-	"time"
-
 	"context"
+	"time"
 
 	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )