diff --git a/internal/archiver/archiver.go b/internal/archiver/archiver.go
index bc5a31483..2597e4143 100644
--- a/internal/archiver/archiver.go
+++ b/internal/archiver/archiver.go
@@ -823,6 +823,10 @@ func (arch *Archiver) Snapshot(ctx context.Context, targets []string, opts Snaps
 	}
 
 	sn, err := restic.NewSnapshot(targets, opts.Tags, opts.Hostname, opts.Time)
+	if err != nil {
+		return nil, restic.ID{}, err
+	}
+
 	sn.Excludes = opts.Excludes
 	if !opts.ParentSnapshot.IsNull() {
 		id := opts.ParentSnapshot
diff --git a/internal/backend/sftp/layout_test.go b/internal/backend/sftp/layout_test.go
index 81e5f3240..99e18a746 100644
--- a/internal/backend/sftp/layout_test.go
+++ b/internal/backend/sftp/layout_test.go
@@ -60,6 +60,7 @@ func TestLayout(t *testing.T) {
 				datafiles[fi.Name] = false
 				return nil
 			})
+			rtest.OK(t, err)
 
 			if len(datafiles) == 0 {
 				t.Errorf("List() returned zero data files")
diff --git a/internal/repository/index_test.go b/internal/repository/index_test.go
index 599f243f3..d64e8585a 100644
--- a/internal/repository/index_test.go
+++ b/internal/repository/index_test.go
@@ -134,6 +134,7 @@ func TestIndexSerialize(t *testing.T) {
 	id := restic.NewRandomID()
 	rtest.OK(t, idx.SetID(id))
 	id2, err := idx.ID()
+	rtest.OK(t, err)
 	rtest.Assert(t, id2.Equal(id),
 		"wrong ID returned: want %v, got %v", id, id2)
 
diff --git a/internal/restic/config_test.go b/internal/restic/config_test.go
index dd3ddcc74..506381965 100644
--- a/internal/restic/config_test.go
+++ b/internal/restic/config_test.go
@@ -36,6 +36,7 @@ func TestConfig(t *testing.T) {
 	rtest.OK(t, err)
 
 	_, err = saver(save).SaveJSONUnpacked(restic.ConfigFile, cfg1)
+	rtest.OK(t, err)
 
 	load := func(ctx context.Context, tpe restic.FileType, id restic.ID, arg interface{}) error {
 		rtest.Assert(t, tpe == restic.ConfigFile,