diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 126464f81f33b633cd6df47012e3d9d5b58ed4ef..5fd0c63c1ba592bb5a4371640c1d79835cb2df2d 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-*   Implement rename_index natively for MySQL > 5.7.
+*   Implement rename_index natively for MySQL >= 5.7.
 
     *Cody Cutrer*
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 3aa460491216e855d76978cfe66a69bb4ebab414..3d3c3ee79b0b764363cde42b6f50de6b36c64858 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -488,7 +488,7 @@ def rename_table(table_name, new_name)
       end
 
       def rename_index(table_name, old_name, new_name)
-        if version[0] >= 5 && version[1] >= 7
+        if (version[0] == 5 && version[1] >= 7) || version[0] >= 6
           execute "ALTER TABLE #{quote_table_name(table_name)} RENAME INDEX #{quote_table_name(old_name)} TO #{quote_table_name(new_name)}"
         else
           super