diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result
index fff80d976b9..d97abbaa2e3 100644
--- a/mysql-test/r/explain_json.result
+++ b/mysql-test/r/explain_json.result
@@ -313,31 +313,31 @@ drop table t1;
 # Join buffering
 #
 create table t1 (a int, b int);
-insert into t1 select A.a+10*B.a, A.a+10*B.a from t0 A, t0 B;
+insert into t1 select tbl1.a+10*tbl2.a, tbl1.a+10*tbl2.a from t0 tbl1, t0 tbl2;
 explain format=json
-select * from t1 A, t1 B where A.a=B.a and A.b < 3 and B.b < 5;
+select * from t1 tbl1, t1 tbl2 where tbl1.a=tbl2.a and tbl1.b < 3 and tbl2.b < 5;
 EXPLAIN
 {
   "query_block": {
     "select_id": 1,
     "table": {
-      "table_name": "A",
+      "table_name": "tbl1",
       "access_type": "ALL",
       "rows": 100,
       "filtered": 100,
-      "attached_condition": "(A.b < 3)"
+      "attached_condition": "(tbl1.b < 3)"
     },
     "block-nl-join": {
       "table": {
-        "table_name": "B",
+        "table_name": "tbl2",
         "access_type": "ALL",
         "rows": 100,
         "filtered": 100,
-        "attached_condition": "(B.b < 5)"
+        "attached_condition": "(tbl2.b < 5)"
       },
       "buffer_type": "flat",
       "join_type": "BNL",
-      "attached_condition": "(B.a = A.a)"
+      "attached_condition": "(tbl2.a = tbl1.a)"
     }
   }
 }
diff --git a/mysql-test/t/explain_json.test b/mysql-test/t/explain_json.test
index 6a58796ab13..3917ce40b1e 100644
--- a/mysql-test/t/explain_json.test
+++ b/mysql-test/t/explain_json.test
@@ -63,10 +63,10 @@ drop table t1;
 --echo # Join buffering
 --echo #
 create table t1 (a int, b int);
-insert into t1 select A.a+10*B.a, A.a+10*B.a from t0 A, t0 B;
+insert into t1 select tbl1.a+10*tbl2.a, tbl1.a+10*tbl2.a from t0 tbl1, t0 tbl2;
 
 explain format=json
-select * from t1 A, t1 B where A.a=B.a and A.b < 3 and B.b < 5;
+select * from t1 tbl1, t1 tbl2 where tbl1.a=tbl2.a and tbl1.b < 3 and tbl2.b < 5;
 
 drop table t1;