diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
index 2f26733e3a..deab21f8d7 100644
--- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
@@ -11,6 +11,7 @@
 
 namespace Transaction;
 
+use FireflyIII\Models\TransactionJournal;
 use TestCase;
 
 /**
@@ -34,8 +35,10 @@ class ConvertControllerTest extends TestCase
      */
     public function testIndexDepositTransfer()
     {
+        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
+
         $this->be($this->user());
-        $this->call('get', route('transactions.convert.index', ['transfer', 683]));
+        $this->call('get', route('transactions.convert.index', ['transfer', $deposit->id]));
         $this->assertResponseStatus(200);
         $this->see('Convert a deposit into a transfer');
     }
@@ -45,8 +48,9 @@ class ConvertControllerTest extends TestCase
      */
     public function testIndexDepositWithdrawal()
     {
+        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
-        $this->call('get', route('transactions.convert.index', ['withdrawal', 683]));
+        $this->call('get', route('transactions.convert.index', ['withdrawal', $deposit->id]));
         $this->assertResponseStatus(200);
         $this->see('Convert a deposit into a withdrawal');
     }
@@ -56,8 +60,9 @@ class ConvertControllerTest extends TestCase
      */
     public function testIndexTransferDeposit()
     {
+        $transfer = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
-        $this->call('get', route('transactions.convert.index', ['deposit', 684]));
+        $this->call('get', route('transactions.convert.index', ['deposit', $transfer->id]));
         $this->assertResponseStatus(200);
         $this->see('Convert a transfer into a deposit');
     }
@@ -67,8 +72,9 @@ class ConvertControllerTest extends TestCase
      */
     public function testIndexTransferWithdrawal()
     {
+        $transfer = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
-        $this->call('get', route('transactions.convert.index', ['withdrawal', 684]));
+        $this->call('get', route('transactions.convert.index', ['withdrawal', $transfer->id]));
         $this->assertResponseStatus(200);
         $this->see('Convert a transfer into a withdrawal');
     }
@@ -78,8 +84,9 @@ class ConvertControllerTest extends TestCase
      */
     public function testIndexWithdrawalDeposit()
     {
+        $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
-        $this->call('get', route('transactions.convert.index', ['deposit', 672]));
+        $this->call('get', route('transactions.convert.index', ['deposit', $withdrawal->id]));
         $this->assertResponseStatus(200);
         $this->see('Convert a withdrawal into a deposit');
     }
@@ -89,8 +96,9 @@ class ConvertControllerTest extends TestCase
      */
     public function testIndexWithdrawalTransfer()
     {
+        $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
-        $this->call('get', route('transactions.convert.index', ['transfer', 672]));
+        $this->call('get', route('transactions.convert.index', ['transfer', $withdrawal->id]));
         $this->assertResponseStatus(200);
         $this->see('Convert a withdrawal into a transfer');
     }
@@ -100,13 +108,14 @@ class ConvertControllerTest extends TestCase
      */
     public function testPostIndex()
     {
+        $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first();
         // convert a withdrawal to a transfer. Requires the ID of another asset account.
         $data = [
             'destination_account_asset' => 2,
         ];
         $this->be($this->user());
-        $this->call('post', route('transactions.convert.index', ['transfer', 672]), $data);
+        $this->call('post', route('transactions.convert.index', ['transfer', $withdrawal->id]), $data);
         $this->assertResponseStatus(302);
-        $this->assertRedirectedToRoute('transactions.show', [672]);
+        $this->assertRedirectedToRoute('transactions.show', [$withdrawal->id]);
     }
 }
diff --git a/tests/acceptance/Controllers/Transaction/MassControllerTest.php b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
index f5278bd6da..e6bf99179e 100644
--- a/tests/acceptance/Controllers/Transaction/MassControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
@@ -11,6 +11,7 @@
 
 namespace Transaction;
 
+use FireflyIII\Models\TransactionJournal;
 use TestCase;
 
 /**
@@ -34,8 +35,9 @@ class MassControllerTest extends TestCase
      */
     public function testDelete()
     {
+        $withdrawals = TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray();
         $this->be($this->user());
-        $this->call('get', route('transactions.mass.delete', [561, 562]));
+        $this->call('get', route('transactions.mass.delete', $withdrawals));
         $this->assertResponseStatus(200);
         $this->see('Delete a number of transactions');
         // has bread crumb
@@ -48,9 +50,9 @@ class MassControllerTest extends TestCase
     public function testDestroy()
     {
         $this->session(['transactions.mass-delete.url' => 'http://localhost']);
-
-        $data = [
-            'confirm_mass_delete' => [56, 37],
+        $deposits = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray();
+        $data     = [
+            'confirm_mass_delete' => $deposits,
         ];
         $this->be($this->user());
         $this->call('post', route('transactions.mass.destroy'), $data);
@@ -58,7 +60,7 @@ class MassControllerTest extends TestCase
         $this->assertResponseStatus(302);
 
         // visit them should give 404.
-        $this->call('get', route('transactions.show', [56]));
+        $this->call('get', route('transactions.show', [$deposits[0]]));
         $this->assertResponseStatus(404);
 
 
@@ -69,8 +71,9 @@ class MassControllerTest extends TestCase
      */
     public function testEdit()
     {
+        $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray();
         $this->be($this->user());
-        $this->call('get', route('transactions.mass.delete', [132, 113]));
+        $this->call('get', route('transactions.mass.delete', $transfers));
         $this->assertResponseStatus(200);
         $this->see('Edit a number of transactions');
         // has bread crumb
@@ -82,27 +85,29 @@ class MassControllerTest extends TestCase
      */
     public function testUpdate()
     {
-
+        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)
+                                     ->whereNull('deleted_at')
+                                     ->first();
         $this->session(['transactions.mass-edit.url' => 'http://localhost']);
 
         $data = [
-            'journals'                      => [132],
-            'description'                   => [132 => 'Updated salary thing'],
-            'amount'                        => [132 => 1600],
-            'amount_currency_id_amount_132' => 1,
-            'date'                          => [132 => '2014-07-24'],
-            'source_account_name'           => [132 => 'Job'],
-            'destination_account_id'        => [132 => 1],
-            'category'                      => [132 => 'Salary'],
+            'journals'                                  => [$deposit->id],
+            'description'                               => [$deposit->id => 'Updated salary thing'],
+            'amount'                                    => [$deposit->id => 1600],
+            'amount_currency_id_amount_' . $deposit->id => 1,
+            'date'                                      => [$deposit->id => '2014-07-24'],
+            'source_account_name'                       => [$deposit->id => 'Job'],
+            'destination_account_id'                    => [$deposit->id => 1],
+            'category'                                  => [$deposit->id => 'Salary'],
         ];
 
         $this->be($this->user());
-        $this->call('post', route('transactions.mass.update', [132]), $data);
+        $this->call('post', route('transactions.mass.update', [$deposit->id]), $data);
         $this->assertSessionHas('success');
         $this->assertResponseStatus(302);
 
         // visit them should show updated content
-        $this->call('get', route('transactions.show', [132]));
+        $this->call('get', route('transactions.show', [$deposit->id]));
         $this->assertResponseStatus(200);
         $this->see('Updated salary thing');
     }
diff --git a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
index 68b777dd1c..df52e7af6f 100644
--- a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
@@ -11,6 +11,7 @@
 
 namespace Transaction;
 
+use FireflyIII\Models\TransactionJournal;
 use TestCase;
 
 /**
@@ -35,8 +36,9 @@ class SplitControllerTest extends TestCase
      */
     public function testEdit()
     {
+        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
         $this->be($this->user());
-        $this->call('get', route('transactions.split.edit', [18]));
+        $this->call('get', route('transactions.split.edit', [$deposit->id]));
         $this->assertResponseStatus(200);
         // has bread crumb
         $this->see('<ol class="breadcrumb">');
@@ -49,9 +51,9 @@ class SplitControllerTest extends TestCase
     public function testUpdate()
     {
         $this->session(['transactions.edit-split.url' => 'http://localhost']);
-
-        $data = [
-            'id'                             => 18,
+        $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first();
+        $data    = [
+            'id'                             => $deposit->id,
             'what'                           => 'deposit',
             'journal_description'            => 'Updated salary',
             'currency_id'                    => 1,
@@ -69,12 +71,12 @@ class SplitControllerTest extends TestCase
             ],
         ];
         $this->be($this->user());
-        $this->call('post', route('transactions.split.update', [18]), $data);
+        $this->call('post', route('transactions.split.update', [$deposit->id]), $data);
         $this->assertResponseStatus(302);
         $this->assertSessionHas('success');
 
         // journal is updated?
-        $this->call('get', route('transactions.show', [18]));
+        $this->call('get', route('transactions.show', [$deposit->id]));
         $this->assertResponseStatus(200);
         $this->see('Updated salary');
         // has bread crumb