diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index 55ac088bc1d..a99c50706c5 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -4,6 +4,7 @@
 production:
   adapter: mysql2
   encoding: utf8
+  collation: utf8_general_ci
   reconnect: false
   database: gitlabhq_production
   pool: 10
@@ -18,6 +19,7 @@ production:
 development:
   adapter: mysql2
   encoding: utf8
+  collation: utf8_general_ci
   reconnect: false
   database: gitlabhq_development
   pool: 5
@@ -31,6 +33,7 @@ development:
 test: &test
   adapter: mysql2
   encoding: utf8
+  collation: utf8_general_ci
   reconnect: false
   database: gitlabhq_test
   pool: 5