diff --git a/content/oci/readonlyoci_test.go b/content/oci/readonlyoci_test.go
index 2fb2d143..f470971b 100644
--- a/content/oci/readonlyoci_test.go
+++ b/content/oci/readonlyoci_test.go
@@ -840,17 +840,15 @@ func Test_deleteAnnotationRefName(t *testing.T) {
 
 func TestNewFromTar_NonTarFile(t *testing.T) {
 
-	emptyfile := "testdata/emptyfile"
-	nontar := "testdata/nontar.tar"
-
-	_, err := NewFromTar(context.Background(), emptyfile)
-	if want := errdef.ErrInvalidTarFile; !errors.Is(err, want) {
-		t.Errorf("OCI.NewFromTar(%s) error = %v, wantErr %v", emptyfile, err, want)
-	}
-
-	_, err = NewFromTar(context.Background(), nontar)
-	if want := errdef.ErrInvalidTarFile; !errors.Is(err, want) {
-		t.Errorf("OCI.NewFromTar(%s) error = %v, wantErr %v", nontar, err, want)
+	testFiles := []string{
+		"testdata/emptyfile",
+		"testdata/nontar.tar",
+	}
+	for _, name := range testFiles {
+		_, err := NewFromTar(context.Background(), name)
+		if want := errdef.ErrInvalidTarFile; !errors.Is(err, want) {
+			t.Errorf("OCI.NewFromTar(%s) error = %v, wantErr %v", name, err, want)
+		}
 	}
 
 }
diff --git a/internal/fs/tarfs/tarfs.go b/internal/fs/tarfs/tarfs.go
index 223adc7b..fffb53d8 100644
--- a/internal/fs/tarfs/tarfs.go
+++ b/internal/fs/tarfs/tarfs.go
@@ -138,13 +138,13 @@ func (tfs *TarFS) indexEntries() error {
 			if errors.Is(err, io.EOF) {
 				if len(tfs.entries) == 0 {
 					// indicates the given file is empty
-					return fmt.Errorf("{%s}: %w", tfs.path, errdef.ErrInvalidTarFile)
+					return fmt.Errorf("%s: file is empty: %w", tfs.path, errdef.ErrInvalidTarFile)
 				}
 				break
 			}
 			if errors.Is(err, io.ErrUnexpectedEOF) {
 				// indicates that its either not a tarfile or it is a corrupted one
-				return fmt.Errorf("{%s}: %w", tfs.path, errdef.ErrInvalidTarFile)
+				return fmt.Errorf("%s: %w", tfs.path, errdef.ErrInvalidTarFile)
 			}
 			return err
 		}
diff --git a/internal/fs/tarfs/tarfs_test.go b/internal/fs/tarfs/tarfs_test.go
index 0188eb57..94f560ab 100644
--- a/internal/fs/tarfs/tarfs_test.go
+++ b/internal/fs/tarfs/tarfs_test.go
@@ -270,22 +270,19 @@ func TestTarFS_Stat_Unsupported(t *testing.T) {
 }
 
 func TestTarFS_New_NonTarFile(t *testing.T) {
-
-	emptyfile := "testdata/emptyfile.tar"
-	nontar := "testdata/nontar.tar"
-	tarwithoutextension := "testdata/tarwithoutextension"
-
-	_, err := New(emptyfile)
-	if want := errdef.ErrInvalidTarFile; !errors.Is(err, want) {
-		t.Errorf("TarFS.New(%s) error = %v, wantErr %v", emptyfile, err, want)
+	testFiles := []string{
+		"testdata/emptyfile.tar",
+		"testdata/nontar.tar",
 	}
-
-	_, err = New(nontar)
-	if want := errdef.ErrInvalidTarFile; !errors.Is(err, want) {
-		t.Errorf("TarFS.New(%s) error = %v, wantErr %v", nontar, err, want)
+	for _, name := range testFiles {
+		_, err := New(name)
+		if want := errdef.ErrInvalidTarFile; !errors.Is(err, want) {
+			t.Errorf("TarFS.New(%s) error = %v, wantErr %v", name, err, want)
+		}
 	}
 
-	_, err = New(tarwithoutextension)
+	tarwithoutextension := "testdata/tarwithoutextension"
+	_, err := New(tarwithoutextension)
 	if err != nil {
 		t.Errorf("TarFS.New(%s) error = %v, wantErr %v", tarwithoutextension, err, nil)
 	}