diff --git a/image/image_test.go b/image/image_test.go
index e83440b..455781a 100644
--- a/image/image_test.go
+++ b/image/image_test.go
@@ -175,7 +175,7 @@ func TestValidateLayout(t *testing.T) {
 		manifest: manifestStr,
 		config:   configStr,
 		tarList: []tarContent{
-			tarContent{&tar.Header{Name: "test", Size: 4, Mode: 0600}, []byte("test")},
+			{&tar.Header{Name: "test", Size: 4, Mode: 0600}, []byte("test")},
 		},
 	}
 
diff --git a/image/manifest_test.go b/image/manifest_test.go
index 1657ad0..f1810a7 100644
--- a/image/manifest_test.go
+++ b/image/manifest_test.go
@@ -142,10 +142,12 @@ func testUnpackLayer(t *testing.T, compression string, invalid bool) {
 	}
 
 	testManifest := manifest{
-		Layers: []v1.Descriptor{v1.Descriptor{
-			MediaType: mediatype,
-			Digest:    digester.Digest(),
-		}},
+		Layers: []v1.Descriptor{
+			{
+				MediaType: mediatype,
+				Digest:    digester.Digest(),
+			},
+		},
 	}
 	err = testManifest.unpack(newPathWalker(tmp1), filepath.Join(tmp1, "rootfs"))
 	if err != nil {
@@ -211,10 +213,12 @@ func TestUnpackLayerRemovePartialyUnpackedFile(t *testing.T) {
 	}
 
 	testManifest := manifest{
-		Layers: []v1.Descriptor{v1.Descriptor{
-			MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
-			Digest:    digester.Digest(),
-		}},
+		Layers: []v1.Descriptor{
+			{
+				MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
+				Digest:    digester.Digest(),
+			},
+		},
 	}
 	err = testManifest.unpack(newPathWalker(tmp1), filepath.Join(tmp1, "rootfs"))
 	if err != nil && !strings.Contains(err.Error(), "duplicate entry for") {
@@ -226,6 +230,6 @@ func TestUnpackLayerRemovePartialyUnpackedFile(t *testing.T) {
 		t.Fatal(err)
 	}
 	if err == nil {
-		t.Fatal("Execpt partialy unpacked file has been removed")
+		t.Fatal("Except partially unpacked file has been removed")
 	}
 }