diff --git a/go/mysql/flavor_mysql.go b/go/mysql/flavor_mysql.go
index ad23854d374..407c14e34b0 100644
--- a/go/mysql/flavor_mysql.go
+++ b/go/mysql/flavor_mysql.go
@@ -363,7 +363,7 @@ const TablesWithSize80 = `SELECT t.table_name,
 	SUM(i.file_size),
 	SUM(i.allocated_size)
 FROM information_schema.tables t
-INNER JOIN information_schema.innodb_tablespaces i
+LEFT JOIN information_schema.innodb_tablespaces i
 	ON i.name LIKE CONCAT(database(), '/%') AND (i.name = CONCAT(t.table_schema, '/', t.table_name) OR i.name LIKE CONCAT(t.table_schema, '/', t.table_name, '#p#%'))
 WHERE t.table_schema = database()
 GROUP BY t.table_name, t.table_type, t.create_time, t.table_comment`
diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go
index 1098632d87e..2b3eaf4bbda 100644
--- a/go/test/endtoend/vreplication/vstream_test.go
+++ b/go/test/endtoend/vreplication/vstream_test.go
@@ -190,7 +190,7 @@ const vschemaUnsharded = `
 }
 `
 const schemaSharded = `
-create table customer(cid int, name varbinary(128), primary key(cid))  CHARSET=utf8mb4;
+create table customer(cid int, name varbinary(128), primary key(cid)) TABLESPACE innodb_system CHARSET=utf8mb4;
 `
 const vschemaSharded = `
 {