diff --git a/tests/Feature/RecurringInvoiceTest.php b/tests/Feature/RecurringInvoiceTest.php
index 9170de330c2c..b995bc47e135 100644
--- a/tests/Feature/RecurringInvoiceTest.php
+++ b/tests/Feature/RecurringInvoiceTest.php
@@ -166,11 +166,12 @@ class RecurringInvoiceTest extends TestCase
                 'company_id' => $this->company->id,
             ]);
         });
-        $client = Client::all()->first();
+
+        $client = Client::query()->orderBy('id', 'DESC')->first();
 
         RecurringInvoice::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
-        $RecurringInvoice = RecurringInvoice::where('user_id', $this->user->id)->first();
+        $RecurringInvoice = RecurringInvoice::query()->where('user_id', $this->user->id)->orderBy('id', 'DESC')->first();
         $RecurringInvoice->save();
 
         $response = $this->withHeaders([
diff --git a/tests/Feature/RecurringQuoteTest.php b/tests/Feature/RecurringQuoteTest.php
index ecde6a5bc0fd..5c3d98718ae6 100644
--- a/tests/Feature/RecurringQuoteTest.php
+++ b/tests/Feature/RecurringQuoteTest.php
@@ -63,7 +63,7 @@ class RecurringQuoteTest extends TestCase
     {
         RecurringQuote::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
-        $RecurringQuote = RecurringQuote::where('user_id', $this->user->id)->first();
+        $RecurringQuote = RecurringQuote::query()->where('user_id', $this->user->id)->orderBy('id','DESC')->first();
         $RecurringQuote->save();
 
         $response = $this->withHeaders([