diff --git a/core/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test
index 2d936be..ac4d952 100644
--- a/core/modules/field/modules/text/text.test
+++ b/core/modules/field/modules/text/text.test
@@ -434,7 +434,7 @@ class TextTranslationTestCase extends DrupalWebTestCase {
     $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support with translation.
-    $edit = array('node_type_language' => TRANSLATION_ENABLED);
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), t('Article content type has been updated.'));
   }
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 0623099..7c3c24a 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -314,7 +314,7 @@ function locale_form_node_type_form_alter(&$form, &$form_state) {
   $form['language']['node_type_language_locked'] = array(
     '#type' => 'checkbox',
     '#title' => t('Lock language'),
-    '#default_value' => variable_get('node_type_language_locked_' . $type, 1),
+    '#default_value' => variable_get('node_type_language_locked_' . $type, TRUE),
     '#description' => t('Users will not be able to change the default language on content of this type.'),
   );
 }
diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index 208c5e6..7e3451e 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -1272,7 +1272,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase {
     $this->assertEqual($GLOBALS['language_interface']->langcode, $this->langcode, t('Current language: %lang', array('%lang' => $GLOBALS['language_interface']->langcode)));
 
     // Enable multilingual workflow option for articles.
-    variable_set('node_type_language_article', 1);
+    variable_set('node_type_language_locked_article', FALSE);
 
     // Change JavaScript translations directory.
     variable_set('locale_js_directory', 'js_translations');
@@ -1985,9 +1985,9 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
 
     // Set "Basic page" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/page');
-    $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.'));
+    $this->assertText(t('Language settings'), t('Multilingual support fieldset present on content type configuration form.'));
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
@@ -2057,7 +2057,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
     // Set "Article" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/article');
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), t('Article content type has been updated.'));
@@ -2549,7 +2549,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
 
     // Set "Basic page" content type to use multilingual support.
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
@@ -2663,7 +2663,7 @@ class LocaleCommentLanguageFunctionalTest extends DrupalWebTestCase {
     $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support.
-    $edit = array('node_type_language' => 1);
+    $edit = array('node_type_language_locked' => FALSE);
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
 
     // Enable content language negotiation UI.
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index 9a63f74..8f0e13c 100644
--- a/core/modules/path/path.test
+++ b/core/modules/path/path.test
@@ -260,7 +260,7 @@ class PathLanguageTestCase extends DrupalWebTestCase {
    */
   function testAliasTranslation() {
     // Set 'page' content type to enable translation.
-    variable_set('node_type_language_locked_page', 0);
+    variable_set('node_type_language_locked_page', FALSE);
     variable_set('node_type_language_translation_enabled_page', TRANSLATION_ENABLED);
 
     $english_node = $this->drupalCreateNode(array('type' => 'page'));
diff --git a/core/modules/poll/poll.test b/core/modules/poll/poll.test
index ad63d0f..d7403a5 100644
--- a/core/modules/poll/poll.test
+++ b/core/modules/poll/poll.test
@@ -842,8 +842,7 @@ class PollTranslateTestCase extends PollTestCase {
 
     // Set "Poll" content type to use multilingual support with translation.
     $this->drupalGet('admin/structure/types/manage/poll');
-    $edit = array();
-    $edit['node_type_language'] = TRANSLATION_ENABLED;
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/poll', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Poll')), t('Poll content type has been updated.'));
 
diff --git a/core/modules/simpletest/tests/upgrade/upgrade.language.test b/core/modules/simpletest/tests/upgrade/upgrade.language.test
index b132e10..5a9e9a3 100644
--- a/core/modules/simpletest/tests/upgrade/upgrade.language.test
+++ b/core/modules/simpletest/tests/upgrade/upgrade.language.test
@@ -76,6 +76,6 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
     $this->drupalGet('node/add/article');
     $this->assertFieldByName('langcode');
     $this->drupalGet('node/add/page');
-    $this->assertNoFieldByName('langcode');
+    $this->assertFieldByName('langcode');
   }
 }
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index 198a247..2bcff72 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -37,8 +37,7 @@ class TranslationTestCase extends DrupalWebTestCase {
     // Set "Basic page" content type to use multilingual support with
     // translation.
     $this->drupalGet('admin/structure/types/manage/page');
-    $edit = array();
-    $edit['node_type_language_translation_enabled'] = TRANSLATION_ENABLED;
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));