diff --git a/pkg/api/validation.go b/pkg/api/validation.go
index de34dcce39..b3b2385f87 100644
--- a/pkg/api/validation.go
+++ b/pkg/api/validation.go
@@ -321,7 +321,7 @@ func ValidateReplicationController(controller *ReplicationController) []error {
 		errors = append(errors, makeInvalidError("ReplicationController.ReplicaSelector", controller.DesiredState.ReplicaSelector))
 	}
 	if controller.DesiredState.Replicas < 0 {
-		errors = append(errors, makeInvalidError("ReplicationController.Replicas", controller.DesiredState.Replicas ))
+		errors = append(errors, makeInvalidError("ReplicationController.Replicas", controller.DesiredState.Replicas))
 	}
 	errors = append(errors, ValidateManifest(&controller.DesiredState.PodTemplate.DesiredState.Manifest)...)
 	return errors
diff --git a/pkg/api/validation_test.go b/pkg/api/validation_test.go
index 9d4ec61b43..8c1a8246df 100644
--- a/pkg/api/validation_test.go
+++ b/pkg/api/validation_test.go
@@ -420,7 +420,7 @@ func TestValidateReplicationController(t *testing.T) {
 		"negative_replicas": {
 			JSONBase: JSONBase{ID: "abc"},
 			DesiredState: ReplicationControllerState{
-				Replicas: -1,
+				Replicas:        -1,
 				ReplicaSelector: validSelector,
 			},
 		},
diff --git a/pkg/apiserver/minionproxy_test.go b/pkg/apiserver/minionproxy_test.go
index 419b57d0bb..e298a9b361 100644
--- a/pkg/apiserver/minionproxy_test.go
+++ b/pkg/apiserver/minionproxy_test.go
@@ -111,7 +111,7 @@ func TestMinionProxy(t *testing.T) {
 		fmt.Sprintf("/%s", proxy.Host): "/",
 	}
 
-	for value, _ := range failureCases {
+	for value := range failureCases {
 		resp, err := http.Get(fmt.Sprintf("%s%s", server.URL, value))
 		if err != nil {
 			t.Errorf("unexpected error for %s: %v", value, err)
diff --git a/pkg/kubelet/config/file_test.go b/pkg/kubelet/config/file_test.go
index cb41669e85..4fed13fd29 100644
--- a/pkg/kubelet/config/file_test.go
+++ b/pkg/kubelet/config/file_test.go
@@ -73,11 +73,9 @@ func TestReadFromFile(t *testing.T) {
 		expected := CreatePodUpdate(kubelet.SET, kubelet.Pod{
 			Name: "test",
 			Manifest: api.ContainerManifest{
-				ID:      "test",
-				Version: "v1beta1",
-				Containers: []api.Container{api.Container{
-					Image: "test/image"},
-				},
+				ID:         "test",
+				Version:    "v1beta1",
+				Containers: []api.Container{{Image: "test/image"}},
 			},
 		})
 		if !reflect.DeepEqual(expected, update) {
diff --git a/pkg/kubelet/server_test.go b/pkg/kubelet/server_test.go
index 4249351666..9ea5f92f20 100644
--- a/pkg/kubelet/server_test.go
+++ b/pkg/kubelet/server_test.go
@@ -106,7 +106,7 @@ func TestContainer(t *testing.T) {
 	if len(received) != 1 {
 		t.Errorf("Expected 1 manifest, but got %v", len(received))
 	}
-	expectedPods := []Pod{Pod{Name: "1", Manifest: expected[0]}}
+	expectedPods := []Pod{{Name: "1", Manifest: expected[0]}}
 	if !reflect.DeepEqual(expectedPods, received[0]) {
 		t.Errorf("Expected %#v, but got %#v", expectedPods, received[0])
 	}
@@ -129,7 +129,7 @@ func TestContainers(t *testing.T) {
 	if len(received) != 1 {
 		t.Errorf("Expected 1 update, but got %v", len(received))
 	}
-	expectedPods := []Pod{Pod{Name: "1", Manifest: expected[0]}, Pod{Name: "2", Manifest: expected[1]}}
+	expectedPods := []Pod{{Name: "1", Manifest: expected[0]}, {Name: "2", Manifest: expected[1]}}
 	if !reflect.DeepEqual(expectedPods, received[0]) {
 		t.Errorf("Expected %#v, but got %#v", expectedPods, received[0])
 	}