diff --git a/consul/state/state_store_test.go b/consul/state/state_store_test.go
index c527e59b82..5f82cdc271 100644
--- a/consul/state/state_store_test.go
+++ b/consul/state/state_store_test.go
@@ -209,7 +209,7 @@ func TestStateStore_GC(t *testing.T) {
 	}
 	d := &structs.DirEntry{
 		Key:     "lock",
-		Session:  session.ID,
+		Session: session.ID,
 	}
 	if ok, err := s.KVSLock(11, d); !ok || err != nil {
 		t.Fatalf("err: %v", err)
diff --git a/consul/state/watch_test.go b/consul/state/watch_test.go
index 1d31abe815..64f08df06e 100644
--- a/consul/state/watch_test.go
+++ b/consul/state/watch_test.go
@@ -211,14 +211,14 @@ func TestWatch_PrefixWatch(t *testing.T) {
 }
 
 type MockWatch struct {
-	Waits map[chan struct{}] int
-	Clears map[chan struct{}] int
+	Waits  map[chan struct{}]int
+	Clears map[chan struct{}]int
 }
 
 func NewMockWatch() *MockWatch {
 	return &MockWatch{
-		Waits:  make(map[chan struct{}] int),
-		Clears: make(map[chan struct{}] int),
+		Waits:  make(map[chan struct{}]int),
+		Clears: make(map[chan struct{}]int),
 	}
 }
 
diff --git a/consul/structs/structs.go b/consul/structs/structs.go
index 175f6deb38..c9dcc1b326 100644
--- a/consul/structs/structs.go
+++ b/consul/structs/structs.go
@@ -259,13 +259,13 @@ func (s *ServiceNode) Clone() *ServiceNode {
 	copy(tags, s.ServiceTags)
 
 	return &ServiceNode{
-		Node: s.Node,
-		Address: s.Address,
-		ServiceID: s.ServiceID,
-		ServiceName: s.ServiceName,
-		ServiceTags: tags,
+		Node:           s.Node,
+		Address:        s.Address,
+		ServiceID:      s.ServiceID,
+		ServiceName:    s.ServiceName,
+		ServiceTags:    tags,
 		ServiceAddress: s.ServiceAddress,
-		ServicePort: s.ServicePort,
+		ServicePort:    s.ServicePort,
 		RaftIndex: RaftIndex{
 			CreateIndex: s.CreateIndex,
 			ModifyIndex: s.ModifyIndex,