diff --git a/components_test.go b/components_test.go
index 50f20fd..f4c36e7 100644
--- a/components_test.go
+++ b/components_test.go
@@ -36,7 +36,7 @@ func TestComponentsService_GetAll(t *testing.T) {
 			},
 		},
 		Components: []Component{
-			Component{
+			{
 				ID:          1,
 				Name:        "API",
 				Description: "This is the Cachet API.",
@@ -212,7 +212,7 @@ func TestComponentsService_GetAllGroups(t *testing.T) {
 			},
 		},
 		ComponentGroups: []ComponentGroup{
-			ComponentGroup{
+			{
 				ID:        1,
 				Name:      "Websites",
 				Order:     1,
diff --git a/incidents_test.go b/incidents_test.go
index 31b909f..4218e11 100644
--- a/incidents_test.go
+++ b/incidents_test.go
@@ -36,7 +36,7 @@ func TestIncidentsService_GetAll(t *testing.T) {
 			},
 		},
 		Incidents: []Incident{
-			Incident{
+			{
 				ID:          1,
 				ComponentID: 0,
 				Name:        "Incident Name",
diff --git a/metrics_test.go b/metrics_test.go
index feb8915..839a7e4 100644
--- a/metrics_test.go
+++ b/metrics_test.go
@@ -36,7 +36,7 @@ func TestMetricsService_GetAll(t *testing.T) {
 			},
 		},
 		Metrics: []Metric{
-			Metric{
+			{
 				ID:           1,
 				Name:         "Cups of coffee",
 				Suffix:       "Cups",
@@ -48,7 +48,7 @@ func TestMetricsService_GetAll(t *testing.T) {
 				UpdatedAt:    "2015-10-31 14:30:02",
 				Places:       2,
 				Points: []Point{
-					Point{
+					{
 						ID:        1,
 						MetricID:  1,
 						Value:     7,
@@ -91,7 +91,7 @@ func TestMetricsService_Get(t *testing.T) {
 		UpdatedAt:    "2015-10-31 14:30:02",
 		Places:       2,
 		Points: []Point{
-			Point{
+			{
 				ID:        1,
 				MetricID:  1,
 				Value:     7,
@@ -180,14 +180,14 @@ func TestMetricsService_GetPoints(t *testing.T) {
 	}
 
 	expected := &[]Point{
-		Point{
+		{
 			ID:        1,
 			MetricID:  1,
 			Value:     4,
 			CreatedAt: "2015-10-31 16:30:02",
 			UpdatedAt: "2015-10-31 16:30:02",
 		},
-		Point{
+		{
 			ID:        2,
 			MetricID:  1,
 			Value:     6,