diff --git a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
index 60d558d..9335d22 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
@@ -84,7 +84,7 @@ public function testMimeHeader($value, $encoded) {
    * @return array
    *   An array containing a string and its encoded value.
    */
-  public static function providerTestMimeHeader() {
+  public function providerTestMimeHeader() {
     return array(
       array('tést.txt', '=?UTF-8?B?dMOpc3QudHh0?='),
       // Simple ASCII characters.
@@ -92,7 +92,6 @@ public static function providerTestMimeHeader() {
     );
   }
 
-
   /**
    * Tests Unicode::strtolower().
    *
@@ -113,7 +112,7 @@ public function testStrtolower($text, $expected, $multibyte = FALSE) {
    *   An array containing a string, its lowercase version and whether it should
    *   be processed as multibyte.
    */
-  public static function providerStrtolower() {
+  public function providerStrtolower() {
     $cases = array(
       array('tHe QUIcK bRoWn', 'the quick brown'),
       array('FrançAIS is ÜBER-åwesome', 'français is über-åwesome'),
@@ -148,7 +147,7 @@ public function testStrtoupper($text, $expected, $multibyte = FALSE) {
    *   An array containing a string, its uppercase version and whether it should
    *   be processed as multibyte.
    */
-  public static function providerStrtoupper() {
+  public function providerStrtoupper() {
     $cases = array(
       array('tHe QUIcK bRoWn', 'THE QUICK BROWN'),
       array('FrançAIS is ÜBER-åwesome', 'FRANÇAIS IS ÜBER-ÅWESOME'),
@@ -180,7 +179,7 @@ public function testUcfirst($text, $expected) {
    * @return array
    *   An array containing a string and its uppercase first version.
    */
-  public static function providerUcfirst() {
+  public function providerUcfirst() {
     return array(
       array('tHe QUIcK bRoWn', 'THe QUIcK bRoWn'),
       array('françAIS', 'FrançAIS'),
@@ -213,7 +212,7 @@ public function testStrlen($text, $expected) {
    * @return array
    *   An array containing a string and its length.
    */
-  public static function providerStrlen() {
+  public function providerStrlen() {
     return array(
       array('tHe QUIcK bRoWn', 15),
       array('ÜBER-åwesome', 12),
@@ -246,7 +245,7 @@ public function testSubstr($text, $start, $length, $expected) {
    *     - The length number to be processed by substr.
    *     - The expected string result.
    */
-  public static function providerSubstr() {
+  public function providerSubstr() {
     return array(
       array('frànçAIS is über-åwesome', 0, 0, ''),
       array('frànçAIS is über-åwesome', 0, 1, 'f'),
@@ -298,7 +297,7 @@ public function testTruncate($text, $max_length, $expected, $wordsafe = FALSE, $
    *     - (optional) Boolean for the $wordsafe flag. Defaults to FALSE.
    *     - (optional) Boolean for the $add_ellipsis flag. Defaults to FALSE.
    */
-  public static function providerTruncate() {
+  public function providerTruncate() {
     return array(
       array('frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome'),
       array('frànçAIS is über-åwesome', 23, 'frànçAIS is über-åwesom'),
@@ -370,7 +369,7 @@ public function testTruncateBytes($text, $max_length, $expected) {
    *   An array of arrays, each containing the parameters to
    *   self::testTruncateBytes().
    */
-  public static function providerTestTruncateBytes() {
+  public function providerTestTruncateBytes() {
     return array(
       // String shorter than max length.
       array('Short string', 42, 'Short string'),
@@ -406,7 +405,7 @@ public function testValidateUtf8($text, $expected, $message) {
    *
    * Invalid UTF-8 examples sourced from http://stackoverflow.com/a/11709412/109119.
    */
-  public static function providerTestValidateUtf8() {
+  public function providerTestValidateUtf8() {
     return array(
       // Empty string.
       array('', TRUE, 'An empty string did not validate.'),
@@ -442,7 +441,7 @@ public function testConvertToUtf8($data, $encoding, $expected) {
    *   An array of arrays, each containg the parameters to
    *   self::testConvertUtf8().  }
    */
-  public static function providerTestConvertToUtf8() {
+  public function providerTestConvertToUtf8() {
     return array(
       array(chr(0x97), 'Windows-1250', '—'),
       array(chr(0x99), 'Windows-1250', '™'),