diff --git a/core/modules/link/link.module b/core/modules/link/link.module
index 46aeeba..4c9e359 100644
--- a/core/modules/link/link.module
+++ b/core/modules/link/link.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Link;
 
 /**
  * Implements hook_help().
@@ -61,5 +62,5 @@ function link_theme() {
  *   - url: A \Drupal\Core\Url object.
  */
 function template_preprocess_link_formatter_link_separate(&$variables) {
-  $variables['link'] = \Drupal::l($variables['url_title'], $variables['url']);
+  $variables['link'] = Link::fromTextAndUrl($variables['url_title'], $variables['url']);
 }
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php
index 79c2cbb..1f8f0ef 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/src/Tests/LinkFieldTest.php
@@ -12,6 +12,7 @@
 use Drupal\Core\Url;
 use Drupal\link\LinkItemInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\Core\Link;
 
 /**
  * Tests link field widgets and formatters.
@@ -314,7 +315,7 @@ function testLinkTitle() {
     $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
 
     $this->renderTestEntity($id);
-    $expected_link = \Drupal::l($value, Url::fromUri($value));
+    $expected_link = Link::fromTextAndUrl($value, Url::fromUri($value));
     $this->assertRaw($expected_link);
 
     // Verify that a link with text is rendered using the link text.
@@ -326,7 +327,7 @@ function testLinkTitle() {
     $this->assertText(t('entity_test @id has been updated.', array('@id' => $id)));
 
     $this->renderTestEntity($id);
-    $expected_link = \Drupal::l($title, Url::fromUri($value));
+    $expected_link = Link::fromTextAndUrl($title, Url::fromUri($value));
     $this->assertRaw($expected_link);
   }