diff --git a/tests/acceptance/Controllers/BillControllerTest.php b/tests/acceptance/Controllers/BillControllerTest.php
index e4d8ee3d67..327b740c11 100644
--- a/tests/acceptance/Controllers/BillControllerTest.php
+++ b/tests/acceptance/Controllers/BillControllerTest.php
@@ -64,6 +64,7 @@ class BillControllerTest extends TestCase
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/bills');
         $this->assertResponseStatus(200);
     }
@@ -75,6 +76,7 @@ class BillControllerTest extends TestCase
     public function testRescan($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/bills/rescan/1');
         $this->assertSessionHas('success');
         $this->assertResponseStatus(302);
@@ -87,6 +89,7 @@ class BillControllerTest extends TestCase
     public function testShow($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/bills/show/1');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php
index e35cdd0309..59c05c094a 100644
--- a/tests/acceptance/Controllers/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/BudgetControllerTest.php
@@ -24,6 +24,7 @@ class BudgetControllerTest extends TestCase
             'amount' => 1200,
         ];
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
 
         $this->call('POST', '/budgets/amount/1', $args);
         $this->assertResponseStatus(200);
@@ -79,6 +80,7 @@ class BudgetControllerTest extends TestCase
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/budgets');
         $this->assertResponseStatus(200);
     }
@@ -90,6 +92,7 @@ class BudgetControllerTest extends TestCase
     public function testNoBudget($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/budgets/list/noBudget');
         $this->assertResponseStatus(200);
     }
@@ -104,6 +107,7 @@ class BudgetControllerTest extends TestCase
             'amount' => 1200,
         ];
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
 
         $this->call('POST', '/budgets/income', $args);
         $this->assertResponseStatus(302);
@@ -116,6 +120,7 @@ class BudgetControllerTest extends TestCase
     public function testShow($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/budgets/show/1');
         $this->assertResponseStatus(200);
     }
@@ -164,6 +169,7 @@ class BudgetControllerTest extends TestCase
     public function testUpdateIncome($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/budgets/income');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/CurrencyControllerTest.php b/tests/acceptance/Controllers/CurrencyControllerTest.php
index 1fa2638516..0031752c95 100644
--- a/tests/acceptance/Controllers/CurrencyControllerTest.php
+++ b/tests/acceptance/Controllers/CurrencyControllerTest.php
@@ -78,6 +78,7 @@ class CurrencyControllerTest extends TestCase
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/currency');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php
index 5bdf7ac572..b60e754882 100644
--- a/tests/acceptance/Controllers/HomeControllerTest.php
+++ b/tests/acceptance/Controllers/HomeControllerTest.php
@@ -47,6 +47,7 @@ class HomeControllerTest extends TestCase
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/JsonControllerTest.php b/tests/acceptance/Controllers/JsonControllerTest.php
index bae8241345..9ca2ee8c4c 100644
--- a/tests/acceptance/Controllers/JsonControllerTest.php
+++ b/tests/acceptance/Controllers/JsonControllerTest.php
@@ -33,6 +33,7 @@ class JsonControllerTest extends TestCase
     public function testBoxBillsPaid($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/json/box/bills-paid');
         $this->assertResponseStatus(200);
     }
@@ -44,6 +45,7 @@ class JsonControllerTest extends TestCase
     public function testBoxBillsUnpaid($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/json/box/bills-unpaid');
         $this->assertResponseStatus(200);
     }
@@ -55,6 +57,7 @@ class JsonControllerTest extends TestCase
     public function testBoxIn($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/json/box/in');
         $this->assertResponseStatus(200);
     }
@@ -66,6 +69,7 @@ class JsonControllerTest extends TestCase
     public function testBoxOut($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/json/box/out');
         $this->assertResponseStatus(200);
     }
@@ -77,6 +81,7 @@ class JsonControllerTest extends TestCase
     public function testCategories($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/json/categories');
         $this->assertResponseStatus(200);
     }
@@ -145,6 +150,7 @@ class JsonControllerTest extends TestCase
         $repository->shouldReceive('getJournalsOfType')->with($type)->once()->andReturn(new Collection);
 
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/json/transaction-journals/deposit');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php
index 7c12df546e..b7be9a49fc 100644
--- a/tests/acceptance/Controllers/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/PiggyBankControllerTest.php
@@ -14,13 +14,14 @@
 class PiggyBankControllerTest extends TestCase
 {
     /**
-     * @covers FireflyIII\Http\Controllers\PiggyBankController::add
-     * @covers FireflyIII\Http\Controllers\PiggyBankController::__construct
+     * @covers       FireflyIII\Http\Controllers\PiggyBankController::add
+     * @covers       FireflyIII\Http\Controllers\PiggyBankController::__construct
      * @dataProvider dateRangeProvider
      */
     public function testAdd($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/piggy-banks/add/1');
         $this->assertResponseStatus(200);
     }
@@ -68,12 +69,13 @@ class PiggyBankControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\PiggyBankController::index
+     * @covers       FireflyIII\Http\Controllers\PiggyBankController::index
      * @dataProvider dateRangeProvider
      */
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/piggy-banks');
         $this->assertResponseStatus(200);
     }
@@ -134,12 +136,13 @@ class PiggyBankControllerTest extends TestCase
     }
 
     /**
-     * @covers FireflyIII\Http\Controllers\PiggyBankController::show
+     * @covers       FireflyIII\Http\Controllers\PiggyBankController::show
      * @dataProvider dateRangeProvider
      */
     public function testShow($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/piggy-banks/show/1');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php
index 08f3191c9a..23a3d6a328 100644
--- a/tests/acceptance/Controllers/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/ReportControllerTest.php
@@ -25,6 +25,7 @@ class ReportControllerTest extends TestCase
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/reports');
         $this->assertResponseStatus(200);
 
@@ -47,6 +48,7 @@ class ReportControllerTest extends TestCase
 
 
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/reports/report/default/20160101/20160131/1,2');
         $this->assertResponseStatus(200);
     }
@@ -59,6 +61,7 @@ class ReportControllerTest extends TestCase
     public function testReportDefaultYear($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/reports/report/default/20160101/20161231/1,2');
         $this->assertResponseStatus(200);
     }
@@ -71,6 +74,7 @@ class ReportControllerTest extends TestCase
     public function testReportDefaultMultiYear($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/reports/report/default/20160101/20171231/1,2');
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php
index bf480606c3..3cf1687722 100644
--- a/tests/acceptance/Controllers/TransactionControllerTest.php
+++ b/tests/acceptance/Controllers/TransactionControllerTest.php
@@ -65,6 +65,7 @@ class TransactionControllerTest extends TestCase
     public function testIndex($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/transactions/deposit');
         $this->assertResponseStatus(200);
     }
@@ -90,6 +91,7 @@ class TransactionControllerTest extends TestCase
     public function testShow($range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('GET', '/transaction/show/1');
         $this->assertResponseStatus(200);
     }