diff --git a/composer.lock b/composer.lock
index 832979f..1a21055 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2759,16 +2759,16 @@
     "packages-dev": [
         {
             "name": "behat/mink",
-            "version": "v1.7.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9"
+                "reference": "39e330913923f7c5729e29e80d850816d322ecbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9",
-                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/39e330913923f7c5729e29e80d850816d322ecbb",
+                "reference": "39e330913923f7c5729e29e80d850816d322ecbb",
                 "shasum": ""
             },
             "require": {
@@ -2813,7 +2813,7 @@
                 "testing",
                 "web"
             ],
-            "time": "2016-03-05 08:26:18"
+            "time": "2016-10-14 22:21:05"
         },
         {
             "name": "behat/mink-browserkit-driver",
@@ -4203,7 +4203,9 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "behat/mink": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/core/composer.json b/core/composer.json
index 53ab8fa..a1d4ba8 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -35,7 +35,7 @@
         "asm89/stack-cors": "~1.0"
     },
     "require-dev": {
-        "behat/mink": "~1.7",
+        "behat/mink": "dev-master#39e330913923f7c5729e29e80d850816d322ecbb",
         "behat/mink-goutte-driver": "~1.2",
         "jcalderonzumba/gastonjs": "~1.0.2",
         "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
diff --git a/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
index 7bb0fb1..7ec5fc0 100644
--- a/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
+++ b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
@@ -98,4 +98,14 @@ public function renderEncodedMarkup() {
     return ['#plain_text' => 'Bad html <script>alert(123);</script>'];
   }
 
+  /**
+   * Renders a page with pipe character in link test.
+   *
+   * @return array
+   *   A render array as expected by drupal_render()
+   */
+  public function renderPipeInLink() {
+    return ['#markup' => '<a href="http://example.com">foo|bar|baz</a>'];
+  }
+
 }
diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
index cbcf6d8..9d07a34 100644
--- a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
+++ b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
@@ -66,3 +66,11 @@ test_page_test.encoded:
     _controller: '\Drupal\test_page_test\Controller\Test::renderEncodedMarkup'
   requirements:
     _access: 'TRUE'
+
+test_page_test.pipe:
+  path: '/test-pipe-char'
+  defaults:
+    _title: 'Page with pipe char in link'
+    _controller: '\Drupal\test_page_test\Controller\Test::renderPipeInLink'
+  requirements:
+    _access: 'TRUE'
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 81fa024..eb315af 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -124,6 +124,16 @@ public function testError() {
   }
 
   /**
+   * Tests linkExists() with pipe character (|) in locator.
+   *
+   * @see \Drupal\Tests\WebAssert::linkExists()
+   */
+  public function testPipeCharInLocator() {
+    $this->drupalGet('test-pipe-char');
+    $this->assertSession()->linkExists('foo|bar|baz');
+  }
+
+  /**
    * Tests legacy asserts.
    */
   public function testLegacyAsserts() {