diff --git a/go/test/endtoend/backup/s3_builtin/s3_backup_endtoend_test.go b/go/test/endtoend/backup/s3/s3_builtin_test.go
similarity index 99%
rename from go/test/endtoend/backup/s3_builtin/s3_backup_endtoend_test.go
rename to go/test/endtoend/backup/s3/s3_builtin_test.go
index b58525b3702..e309197a708 100644
--- a/go/test/endtoend/backup/s3_builtin/s3_backup_endtoend_test.go
+++ b/go/test/endtoend/backup/s3/s3_builtin_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package s3_builtin
+package s3
 
 import (
 	"context"
diff --git a/go/vt/mysqlctl/blackbox/backup_blackbox_race_test.go b/go/vt/mysqlctl/blackbox/backup_race_test.go
similarity index 100%
rename from go/vt/mysqlctl/blackbox/backup_blackbox_race_test.go
rename to go/vt/mysqlctl/blackbox/backup_race_test.go
diff --git a/go/vt/mysqlctl/blackbox/backup_blackbox_test.go b/go/vt/mysqlctl/blackbox/backup_test.go
similarity index 100%
rename from go/vt/mysqlctl/blackbox/backup_blackbox_test.go
rename to go/vt/mysqlctl/blackbox/backup_test.go
diff --git a/test/config.json b/test/config.json
index e07d25819a1..34c6bc1a6be 100644
--- a/test/config.json
+++ b/test/config.json
@@ -138,7 +138,7 @@
 		},
 		"backup_s3": {
 			"File": "unused.go",
-			"Args": ["vitess.io/vitess/go/test/endtoend/backup/s3_builtin", "-timeout", "30m"],
+			"Args": ["vitess.io/vitess/go/test/endtoend/backup/s3", "-timeout", "30m"],
 			"Command": [],
 			"Manual": false,
 			"Shard": "21",