diff --git a/command/event_test.go b/command/event_test.go
index 6238e9167..65882d64d 100644
--- a/command/event_test.go
+++ b/command/event_test.go
@@ -1,10 +1,11 @@
 package command
 
 import (
-	"github.com/hashicorp/consul/command/base"
-	"github.com/mitchellh/cli"
 	"strings"
 	"testing"
+
+	"github.com/hashicorp/consul/command/base"
+	"github.com/mitchellh/cli"
 )
 
 func TestEventCommand_implements(t *testing.T) {
diff --git a/command/info_test.go b/command/info_test.go
index ffa14c2a0..fb1792526 100644
--- a/command/info_test.go
+++ b/command/info_test.go
@@ -1,10 +1,11 @@
 package command
 
 import (
-	"github.com/hashicorp/consul/command/base"
-	"github.com/mitchellh/cli"
 	"strings"
 	"testing"
+
+	"github.com/hashicorp/consul/command/base"
+	"github.com/mitchellh/cli"
 )
 
 func TestInfoCommand_implements(t *testing.T) {
diff --git a/command/leave_test.go b/command/leave_test.go
index 2be71e8d8..fc1a7000c 100644
--- a/command/leave_test.go
+++ b/command/leave_test.go
@@ -1,10 +1,11 @@
 package command
 
 import (
-	"github.com/hashicorp/consul/command/base"
-	"github.com/mitchellh/cli"
 	"strings"
 	"testing"
+
+	"github.com/hashicorp/consul/command/base"
+	"github.com/mitchellh/cli"
 )
 
 func testLeaveCommand(t *testing.T) (*cli.MockUi, *LeaveCommand) {
diff --git a/consul/health_endpoint.go b/consul/health_endpoint.go
index 2562e07f3..56a1be9c8 100644
--- a/consul/health_endpoint.go
+++ b/consul/health_endpoint.go
@@ -2,6 +2,7 @@ package consul
 
 import (
 	"fmt"
+
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/consul/consul/state"
 	"github.com/hashicorp/consul/consul/structs"