diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc
index 3e4c6f1..60e822a 100644
--- a/modules/locale/locale.admin.inc
+++ b/modules/locale/locale.admin.inc
@@ -467,6 +467,9 @@ function locale_languages_delete_form_submit($form, &$form_state) {
       ->fields(array('language' => ''))
       ->condition('language', $form_state['values']['langcode'])
       ->execute();
+    if ($languages[$form_state['values']['langcode']]->enabled) {
+      variable_set('language_count', variable_get('language_count', NULL) - 1);
+    }
     module_invoke_all('multilingual_settings_changed');
     $variables = array('%locale' => $languages[$form_state['values']['langcode']]->name);
     drupal_set_message(t('The language %locale has been removed.', $variables));
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 765bfb6..92a63ee 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -125,6 +125,15 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
     $this->assertRaw($name, t('The language has been updated.'));
     $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.'));
 
+    // Disable an enabled language. Disabling a language will recount the
+    // "locale_count" variable. It must be done before deleting any language,
+    // to test correctly the changing of the variable.
+    $edit = array(
+      'enabled[fr]' => FALSE,
+    );
+    $this->drupalPost($path, $edit, t('Save configuration'));
+    $this->assertNoFieldChecked('edit-enabled-fr', t('French language disabled.'));
+
     // Ensure 'delete' link works.
     $this->drupalGet('admin/config/regional/language');
     $this->clickLink(t('delete'));
@@ -144,6 +153,22 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
     // Verify that language is no longer found.
     $this->drupalGet('admin/config/regional/language/delete/' . $langcode);
     $this->assertResponse(404, t('Language no longer found.'));
+    // Delete a disabled language.
+    $this->drupalPost('admin/config/regional/language/delete/fr', array(), t('Delete'));
+    // We need raw here because %locale will add HTML.
+    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => 'French')), t('Disabled language has been removed.'));
+    $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+    // Verify that language is no longer found.
+    $this->drupalGet('admin/config/regional/language/delete/fr');
+    $this->assertResponse(404, t('Language no longer found.'));
+
+    // Make sure the "locale_count" variable is equal to the number of enabled
+    // languages.
+    $language_count_variable = variable_get('language_count', FALSE);
+    drupal_static_reset('language_list');
+    $enabled = language_list('enabled');
+    $enabled_language_count = count($enabled['1']);
+    $this->assertEqual($language_count_variable, $enabled_language_count, t('Language count is correct.'));
 
     // Ensure we can't delete the English language.
     $this->drupalGet('admin/config/regional/language/delete/en');