diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index 9d172f9..d9a8c0c 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -32,6 +32,30 @@ function locale_enable() {
   locale_language_negotiation_url_domains_save($domains);
 }
 
+ /**
+ * Implementation of hook_install().
+ */
+function locale_install() {
+  //Active negotation URL
+  $data = array(
+    'locale-url' => array(
+      'callbacks' => array(
+        'language' => 'locale_language_from_url',
+        'switcher' => 'locale_language_switcher_url',
+        'url_rewrite' => 'locale_language_url_rewrite_url',
+      ),
+      'file' => '/core/includes/locale.inc',
+    ),
+    'language-default' => array(
+      'callbacks' => array(
+        'language' => 'language_from_default'
+      )
+    )
+  );
+
+  variable_set('language_negotiation_language', $data);
+}
+
 /**
  * Implements hook_uninstall().
  */
diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index d5439a9..a189753 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -2190,6 +2190,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
 
     // Enable browser and URL language detection.
     $edit = array(
+      'language[enabled][locale-url]' => FALSE,
       'language[enabled][locale-browser]' => TRUE,
       'language[enabled][locale-url]' => TRUE,
       'language[weight][locale-browser]' => -8,
diff --git a/core/modules/path/path.test b/core/modules/path/path.test
index 82eefd8..c70badd 100644
--- a/core/modules/path/path.test
+++ b/core/modules/path/path.test
@@ -301,7 +301,7 @@ class PathLanguageTestCase extends DrupalWebTestCase {
     drupal_static_reset('language_list');
     drupal_static_reset('locale_url_outbound_alter');
     $languages = language_list();
-    $url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->language]));
+    $url = url('fr/node/' . $french_node->nid, array('language' => $languages[$french_node->language]));
     $this->assertTrue(strpos($url, $edit['path[alias]']), t('URL contains the path alias.'));
 
     // Confirm that the alias works even when changing language negotiation