diff --git a/validate/validate_test.go b/validate/validate_test.go
index 8115cce93..e001a9044 100644
--- a/validate/validate_test.go
+++ b/validate/validate_test.go
@@ -510,7 +510,7 @@ func TestCheckProcess(t *testing.T) {
 
 func TestCheckLinux(t *testing.T) {
 	weightDevices := []rspec.LinuxWeightDevice{
-		rspec.LinuxWeightDevice{},
+		{},
 	}
 	weightDevices[0].Major = 5
 	weightDevices[0].Minor = 0
diff --git a/validation/mounts/mounts.go b/validation/mounts/mounts.go
index 8cd373805..fe12feef1 100644
--- a/validation/mounts/mounts.go
+++ b/validation/mounts/mounts.go
@@ -15,60 +15,60 @@ func main() {
 
 	// Different combinations of mount types, mount options, mount propagation modes
 	mounts := []rspec.Mount{
-		rspec.Mount{
+		{
 			Destination: "/tmp/test-shared",
 			Type:        "tmpfs",
 			Source:      "tmpfs",
 			Options:     []string{"shared"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/tmp/test-slave",
 			Type:        "tmpfs",
 			Source:      "tmpfs",
 			Options:     []string{"slave"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/tmp/test-private",
 			Type:        "tmpfs",
 			Source:      "tmpfs",
 			Options:     []string{"private"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-shared",
 			Source:      "/etc",
 			Options:     []string{"bind", "shared"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-rshared",
 			Source:      "/etc",
 			Options:     []string{"rbind", "rshared"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-slave",
 			Source:      "/etc",
 			Options:     []string{"bind", "slave"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-rslave",
 			Source:      "/etc",
 			Options:     []string{"rbind", "rslave"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-private",
 			Source:      "/etc",
 			Options:     []string{"bind", "private"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-rprivate",
 			Source:      "/etc",
 			Options:     []string{"rbind", "rprivate"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-unbindable",
 			Source:      "/etc",
 			Options:     []string{"bind", "unbindable"},
 		},
-		rspec.Mount{
+		{
 			Destination: "/mnt/etc-runbindable",
 			Source:      "/etc",
 			Options:     []string{"rbind", "runbindable"},