diff -u b/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
--- b/modules/simpletest/simpletest.info
+++ b/modules/simpletest/simpletest.info
@@ -43,6 +43,6 @@
 files[] = tests/upgrade/upgrade.forum.test
-files[] = tests/upgrade/upgrade.locale.test
 files[] = tests/upgrade/upgrade.node.test
 files[] = tests/upgrade/upgrade.taxonomy.test
 files[] = tests/upgrade/upgrade.upload.test
+files[] = tests/upgrade/upgrade.locale.test
 files[] = tests/upgrade/upgrade.user.test
diff -u b/modules/user/user.install b/modules/user/user.install
--- b/modules/user/user.install
+++ b/modules/user/user.install
@@ -866,6 +866,7 @@
     ->execute();
 
   foreach ($result as $row) {
+    // Use variable_get() to get the unserialized value for free.
     if ($value = variable_get($row->name, FALSE)) {
 
       if (empty($message) && (strpos($value, '!password') !== FALSE)) {