diff --git a/src/Runner/ErrorHandler.php b/src/Runner/ErrorHandler.php
index b4ba135d91..ab7a0192fc 100644
--- a/src/Runner/ErrorHandler.php
+++ b/src/Runner/ErrorHandler.php
@@ -419,11 +419,6 @@ private function trigger(string $file, bool $filterTrigger): IssueTrigger
 
         $trace = $this->filteredStackTrace($filterTrigger);
 
-        // Data Provider methods are called via Reflection
-        if (!isset($trace[1]['file'])) {
-            $trace[1] = $trace[0];
-        }
-
         assert(isset($trace[0]['file']));
         assert(isset($trace[1]['file']));
 
@@ -504,8 +499,8 @@ private function findDataProviderMethodOnCallStack(): array
             }
 
             if ($trace[$frame]['class'] === DataProvider::class) {
-                // PHPUnit\Metadata\Api\DataProvider::dataProvidedByMethods(), ReflectionMethod::invoke()
-                $dataProviderFrame = $frame - 2;
+                // PHPUnit\Metadata\Api\DataProvider::dataProvidedByMethods()
+                $dataProviderFrame = $frame - 1;
 
                 break;
             }