diff --git a/mysql-test/suite/versioning/r/optimized_fields.result b/mysql-test/suite/versioning/r/optimized.result
similarity index 100%
rename from mysql-test/suite/versioning/r/optimized_fields.result
rename to mysql-test/suite/versioning/r/optimized.result
diff --git a/mysql-test/suite/versioning/t/optimized_fields.test b/mysql-test/suite/versioning/t/optimized.test
similarity index 100%
rename from mysql-test/suite/versioning/t/optimized_fields.test
rename to mysql-test/suite/versioning/t/optimized.test