diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
index 6ffdafe..471e449 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
@@ -86,7 +86,7 @@ public function getConstraints() {
         'value' => [
           'Range' => [
             'min' => $min,
-            'minMessage' => $this->t('%name: the value may be no less than %min.', ['%name' => $label, '%min' => $min]),
+            'minMessage' => t('%name: the value may be no less than %min.', ['%name' => $label, '%min' => $min]),
           ]
         ],
       ]);
@@ -97,7 +97,7 @@ public function getConstraints() {
         'value' => [
           'Range' => [
             'max' => $max,
-            'maxMessage' => $this->t('%name: the value may be no greater than %max.', ['%name' => $label, '%max' => $max]),
+            'maxMessage' => t('%name: the value may be no greater than %max.', ['%name' => $label, '%max' => $max]),
           ]
         ],
       ]);
diff --git a/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php b/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
index f1da20a..ec6fd68 100644
--- a/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
+++ b/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
@@ -117,20 +117,20 @@ public function testGetAndSet() {
     // Test validating min setting.
     $definition = BaseFieldDefinition::create('integer')
       ->setSettings(['min' => 5]);
+    $violations = $this->typedDataManager->create($definition, 5)->validate();
+    $this->assertEqual($violations->count(), 0);
     $violations = $this->typedDataManager->create($definition, 6)->validate();
     $this->assertEqual($violations->count(), 0);
-    $violations = $this->typedDataManager->create($definition, -1)->validate();
-    $this->assertEqual($violations->count(), 1);
-    $violations = $this->typedDataManager->create($definition, 0)->validate();
+    $violations = $this->typedDataManager->create($definition, 4)->validate();
     $this->assertEqual($violations->count(), 1);
     // Test validating max setting.
     $definition = BaseFieldDefinition::create('integer')
       ->setSettings(['max' => 5]);
+    $violations = $this->typedDataManager->create($definition, 5)->validate();
+    $this->assertEqual($violations->count(), 0);
     $violations = $this->typedDataManager->create($definition, 6)->validate();
     $this->assertEqual($violations->count(), 1);
-    $violations = $this->typedDataManager->create($definition, -1)->validate();
-    $this->assertEqual($violations->count(), 0);
-    $violations = $this->typedDataManager->create($definition, 0)->validate();
+    $violations = $this->typedDataManager->create($definition, 4)->validate();
     $this->assertEqual($violations->count(), 0);
     // Test validating when settings min/max = 0.
     $definition = BaseFieldDefinition::create('integer')