diff --git a/core/modules/field/src/Tests/FieldDefaultValueCallbackProvider.php b/core/modules/field/src/Tests/FieldDefaultValueCallbackProvider.php
new file mode 100644
index 0000000..5fe0546
--- /dev/null
+++ b/core/modules/field/src/Tests/FieldDefaultValueCallbackProvider.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\field\Tests\FieldDefaultValueCallbackProvider.
+ */
+
+namespace Drupal\field\Tests;
+
+/**
+ * Helper class for \Drupal\field\Tests\FieldDefaultValueCallbackTest.
+ */
+class FieldDefaultValueCallbackProvider {
+
+  /**
+   * Helper callback calculating a default value.
+   */
+  public static function calculateDefaultValue() {
+    return [['value' => 'Calculated default value']];
+  }
+
+}
diff --git a/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php b/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
index 38a23a6..89a4961 100644
--- a/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
+++ b/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
@@ -9,7 +9,6 @@
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -87,16 +86,9 @@ public function testDefaultValueCallbackForm() {
 
     // Set a default value callback instead, and the default field form should
     // not be visible.
-    $field_config->setDefaultValueCallback('Drupal\field\Tests\FieldDefaultValueCallbackTest::calculateDefaultValue')->save();
+    $field_config->setDefaultValueCallback('\Drupal\field\Tests\FieldDefaultValueCallbackProvider::calculateDefaultValue')->save();
     $this->drupalGet('/admin/structure/types/manage/article/fields/node.article.field_test');
     $this->assertNoFieldByName('default_value_input[field_test][0][value]', 'Calculated default value', 'The default field form is not visible when a callback is defined.');
   }
 
-  /**
-   * Helper callback calculating a default value.
-   */
-  public static function calculateDefaultValue() {
-    return [['value' => 'Calculated default value']];
-  }
-
 }