diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
index 7dba7b7ab..998baef05 100644
--- a/src/Eloquent/Builder.php
+++ b/src/Eloquent/Builder.php
@@ -69,7 +69,7 @@ class Builder extends EloquentBuilder
     ];
 
     /**
-     * @return ($function is null ? AggregationBuilder : self)
+     * @return ($function is null ? AggregationBuilder : $this)
      *
      * @inheritdoc
      */
diff --git a/src/Eloquent/DocumentModel.php b/src/Eloquent/DocumentModel.php
index 965b1a444..f8d399e62 100644
--- a/src/Eloquent/DocumentModel.php
+++ b/src/Eloquent/DocumentModel.php
@@ -50,6 +50,7 @@
 use function strlen;
 use function var_export;
 
+/** @mixin Builder */
 trait DocumentModel
 {
     use HybridRelations;
diff --git a/tests/Models/Anniversary.php b/tests/Models/Anniversary.php
index fb78c9a55..c37196c16 100644
--- a/tests/Models/Anniversary.php
+++ b/tests/Models/Anniversary.php
@@ -6,16 +6,10 @@
 
 use Illuminate\Database\Eloquent\Model;
 use MongoDB\Laravel\Eloquent\DocumentModel;
-use MongoDB\Laravel\Eloquent\Model as Eloquent;
-use MongoDB\Laravel\Query\Builder;
 
 /**
  * @property string $name
  * @property string $anniversary
- * @mixin Eloquent
- * @method static Builder create(...$values)
- * @method static Builder truncate()
- * @method static Eloquent sole(...$parameters)
  */
 class Anniversary extends Model
 {
diff --git a/tests/Models/HiddenAnimal.php b/tests/Models/HiddenAnimal.php
index 240238da0..f6217177c 100644
--- a/tests/Models/HiddenAnimal.php
+++ b/tests/Models/HiddenAnimal.php
@@ -6,17 +6,11 @@
 
 use Illuminate\Database\Eloquent\Model;
 use MongoDB\Laravel\Eloquent\DocumentModel;
-use MongoDB\Laravel\Eloquent\Model as Eloquent;
-use MongoDB\Laravel\Query\Builder;
 
 /**
  * @property string $name
  * @property string $country
  * @property bool $can_be_eaten
- * @mixin Eloquent
- * @method static Builder create(...$values)
- * @method static Builder truncate()
- * @method static Eloquent sole(...$parameters)
  */
 final class HiddenAnimal extends Model
 {