diff --git a/mysql-test/main/mysql_json_mysql_upgrade.result b/mysql-test/main/mysql_upgrade_mysql_json.result
similarity index 100%
rename from mysql-test/main/mysql_json_mysql_upgrade.result
rename to mysql-test/main/mysql_upgrade_mysql_json.result
diff --git a/mysql-test/main/mysql_json_mysql_upgrade.test b/mysql-test/main/mysql_upgrade_mysql_json.test
similarity index 100%
rename from mysql-test/main/mysql_json_mysql_upgrade.test
rename to mysql-test/main/mysql_upgrade_mysql_json.test
diff --git a/mysql-test/main/mysql_json_mysql_upgrade_system_tables.result b/mysql-test/main/mysql_upgrade_mysql_json_system_tables.result
similarity index 100%
rename from mysql-test/main/mysql_json_mysql_upgrade_system_tables.result
rename to mysql-test/main/mysql_upgrade_mysql_json_system_tables.result
diff --git a/mysql-test/main/mysql_json_mysql_upgrade_system_tables.test b/mysql-test/main/mysql_upgrade_mysql_json_system_tables.test
similarity index 100%
rename from mysql-test/main/mysql_json_mysql_upgrade_system_tables.test
rename to mysql-test/main/mysql_upgrade_mysql_json_system_tables.test
diff --git a/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result b/mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.result
similarity index 100%
rename from mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result
rename to mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.result
diff --git a/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.test b/mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.test
similarity index 100%
rename from mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.test
rename to mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.test