diff --git a/tests/Browser/ClientPortalTest.php b/tests/Browser/ClientPortalTest.php
index 8f4b0c033d5c..da0afb828490 100644
--- a/tests/Browser/ClientPortalTest.php
+++ b/tests/Browser/ClientPortalTest.php
@@ -160,7 +160,8 @@ class ClientPortalTest extends DuskTestCase
             $browser->visit('/client/invoices')
                 ->assertSee(ctrans('texts.pay_now'))
                 ->waitFor('.dataTable')
-                ->assertVisible('.page-link')
+                ->waitFor('.page-item')
+                ->assertVisible('.page-item')
                 ->assertVisible('tr.odd')
                 ->assertVisible('#datatable_info')
                 ->assertMissing('.dataTables_empty')
@@ -187,6 +188,7 @@ class ClientPortalTest extends DuskTestCase
 
             $browser->visit('/client/recurring_invoices')
                 ->waitFor('.dataTable')
+                ->waitFor('.page-link')
                 ->assertVisible('.page-link')
                 ->assertVisible('#datatable_info')
                 ->visit('client/logout')
@@ -203,7 +205,9 @@ class ClientPortalTest extends DuskTestCase
     {
         $this->browse(function ($browser) {
 
-            $browser->visit('/client/login')
+            $browser
+                ->visit('/client/logout')
+                ->visit('/client/login')
                 ->type('email', 'user@example.com')
                 ->type('password', config('ninja.testvars.password'))
                 ->press('Login')
@@ -212,7 +216,7 @@ class ClientPortalTest extends DuskTestCase
             $browser->visit('/client/payments')
                 ->waitFor('.dataTable')
                 ->assertVisible('#datatable_info')
-                ->visit('client/logout')
+                ->visit('/client/logout')
                 ->assertPathIs('/client/login');
         });
     }
@@ -226,7 +230,8 @@ class ClientPortalTest extends DuskTestCase
     {
         $this->browse(function ($browser) {
 
-            $browser->visit('/client/login')
+            $browser->visit('/client/logout')
+                ->visit('/client/login')
                 ->type('email', 'user@example.com')
                 ->type('password', config('ninja.testvars.password'))
                 ->press('Login')
diff --git a/tests/Browser/CreateAccountTest.php b/tests/Browser/CreateAccountTest.php
deleted file mode 100644
index c623e20cfdae..000000000000
--- a/tests/Browser/CreateAccountTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Tests\Browser;
-
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Support\Facades\DB;
-use Tests\DuskTestCase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Laravel\Dusk\Browser;
-
-class CreateAccountTest extends DuskTestCase
-{
-
-    use WithFaker;
-
-    public function testSignupFormDisplayed()
-    {
-        $response = $this->get('/signup');
-        $response->assertStatus(200);
-    }
-
-}