diff --git a/Makefile b/Makefile
index 8be59c0..db1a7e0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ build:
 
 .PHONY: test
 test:
-	go test -count=1 ./...
+	go test -count=1 -shuffle=on -race -vet=all -failfast ./...
 
 .PHONY: cover
 cover:
@@ -21,10 +21,6 @@ cover:
 release:
 	goreleaser release --clean --snapshot
 
-.PHONY: lint
-lint:
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run --fast
-
 .PHONY: format
 format:
 	gofmt -l -s -w .
diff --git a/internal/pg2s3/client_test.go b/internal/pg2s3/client_test.go
index e31acf5..b36be80 100644
--- a/internal/pg2s3/client_test.go
+++ b/internal/pg2s3/client_test.go
@@ -109,6 +109,34 @@ func TestRestore(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// generate name for backup
+	name, err := pg2s3.GenerateBackupName(cfg.Backup.Prefix)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// create backup
+	backup, err := client.CreateBackup()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// encrypt backup (if applicable)
+	if len(cfg.Encryption.PublicKeys) > 0 {
+		backup, err = client.EncryptBackup(backup, cfg.Encryption.PublicKeys)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		name = name + ".age"
+	}
+
+	// upload backup
+	err = client.UploadBackup(name, backup)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	// list all backups
 	backups, err := client.ListBackups()
 	if err != nil {
@@ -123,7 +151,7 @@ func TestRestore(t *testing.T) {
 	latest := backups[0]
 
 	// download backup
-	backup, err := client.DownloadBackup(latest)
+	backup, err = client.DownloadBackup(latest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,6 +183,34 @@ func TestPrune(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// generate name for backup
+	name, err := pg2s3.GenerateBackupName(cfg.Backup.Prefix)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// create backup
+	backup, err := client.CreateBackup()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// encrypt backup (if applicable)
+	if len(cfg.Encryption.PublicKeys) > 0 {
+		backup, err = client.EncryptBackup(backup, cfg.Encryption.PublicKeys)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		name = name + ".age"
+	}
+
+	// upload backup
+	err = client.UploadBackup(name, backup)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	// list all backups
 	backups, err := client.ListBackups()
 	if err != nil {