diff --git a/go/test/endtoend/backup/vtbackup/backup_only_test.go b/go/test/endtoend/backup/vtbackup/backup_only_test.go
index 3730a1fa586..3b07b6f02a4 100644
--- a/go/test/endtoend/backup/vtbackup/backup_only_test.go
+++ b/go/test/endtoend/backup/vtbackup/backup_only_test.go
@@ -258,15 +258,17 @@ func restore(t *testing.T, tablet *cluster.Vttablet, tabletType string, waitForS
 	log.Infof("restoring tablet %s", time.Now())
 	resetTabletDirectory(t, *tablet, true)
 
-	err := tablet.VttabletProcess.CreateDB(keyspaceName)
-	require.Nil(t, err)
+	if localCluster.VtTabletMajorVersion <= 16 {
+		err := tablet.VttabletProcess.CreateDB(keyspaceName)
+		require.Nil(t, err)
+	}
 
 	// Start tablets
 	tablet.VttabletProcess.ExtraArgs = []string{"--db-credentials-file", dbCredentialFile}
 	tablet.VttabletProcess.TabletType = tabletType
 	tablet.VttabletProcess.ServingStatus = waitForState
 	tablet.VttabletProcess.SupportsBackup = true
-	err = tablet.VttabletProcess.Setup()
+	err := tablet.VttabletProcess.Setup()
 	require.Nil(t, err)
 }
 
diff --git a/go/test/endtoend/backup/vtbackup/main_test.go b/go/test/endtoend/backup/vtbackup/main_test.go
index 8bd41a1562a..3e61459f440 100644
--- a/go/test/endtoend/backup/vtbackup/main_test.go
+++ b/go/test/endtoend/backup/vtbackup/main_test.go
@@ -133,8 +133,7 @@ func TestMain(m *testing.M) {
 		}
 
 		// Create database
-		vttabletVersion, _ := cluster.GetMajorVersion("vttablet")
-		if vttabletVersion <= 16 {
+		if localCluster.VtTabletMajorVersion <= 16 {
 			for _, tablet := range []cluster.Vttablet{*primary, *replica1} {
 				if err := tablet.VttabletProcess.CreateDB(keyspaceName); err != nil {
 					return 1, err