diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
index 1a99bbf..1a1b390 100644
--- a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
@@ -43,6 +43,8 @@ public function providerTestFormatPlural() {
       // @todo support locale_get_plural
       [2, 'Singular', '@count @arg', array('@arg' => '<script>'), array(), '2 &lt;script&gt;'],
       [2, 'Singular', '@count %arg', array('%arg' => '<script>'), array(), '2 <em class="placeholder">&lt;script&gt;</em>'],
+      [1, 'Singular', '@count plural', array(), array('langcode' => NULL), 'Singular'],
+      [1, 'Singular', '@count plural', array(), array('langcode' => 'es'), 'Singular'],
     );
   }
 
@@ -50,12 +52,15 @@ public function providerTestFormatPlural() {
    * @dataProvider providerTestFormatPlural
    */
   public function testFormatPlural($count, $singular, $plural, array $args = array(), array $options = array(), $expected) {
+    $langcode = empty($options['langcode']) ? 'fr' : $options['langcode'];
     $translator = $this->getMock('\Drupal\Core\StringTranslation\Translator\TranslatorInterface');
     $translator->expects($this->once())
       ->method('getStringTranslation')
-      ->will($this->returnCallback(function ($langcode, $string) {
+      ->with($langcode, $this->anything(), $this->anything())
+      ->will($this->returnCallback(function ($langcode, $string, $context) {
         return $string;
       }));
+    $this->translationManager->setDefaultLangcode('fr');
     $this->translationManager->addTranslator($translator);
     $result = $this->translationManager->formatPlural($count, $singular, $plural, $args, $options);
     $this->assertEquals($expected, $result);