diff --git a/database/migrations/2017_05_16_101715_add_default_note_to_client.php b/database/migrations/2017_05_16_101715_add_default_note_to_client.php
index 841550b53448..8a439698b736 100644
--- a/database/migrations/2017_05_16_101715_add_default_note_to_client.php
+++ b/database/migrations/2017_05_16_101715_add_default_note_to_client.php
@@ -49,15 +49,14 @@ class AddDefaultNoteToClient extends Migration
         if (Schema::hasColumn('accounts', 'default_tax_rate_id')) {
             Schema::table('accounts', function ($table) {
                 $table->dropColumn('default_tax_rate_id');
-            }
-        });
+            });
+        }
 
         if (Schema::hasColumn('products', 'default_tax_rate_id')) {
             Schema::table('products', function ($table) {
                 $table->dropColumn('default_tax_rate_id');
-            }
-        });
-
+            });
+        }
     }
 
     /**
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index ffaed0b5b7d2..a3dfcee14a7c 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -90,7 +90,7 @@ class AcceptanceTester extends \Codeception\Actor
 
         if ($taxName && $taxRate) {
             $taxOption = $taxName . ': ' . number_format($taxRate, 3) . '%';
-            $I->selectOption('#default_tax_rate_id', $taxOption);
+            $I->selectOption('#tax_select1', $taxOption);
         }
 
         $I->click('Save');
diff --git a/tests/acceptance/TaxRatesCest.php b/tests/acceptance/TaxRatesCest.php
index 8579dfdc54ba..c1c3ae1b45d8 100644
--- a/tests/acceptance/TaxRatesCest.php
+++ b/tests/acceptance/TaxRatesCest.php
@@ -47,7 +47,7 @@ class TaxRatesCest
         $I->fillField(['name' => 'product_key'], $productKey);
         $I->fillField(['name' => 'notes'], $this->faker->text(80));
         $I->fillField(['name' => 'cost'], $itemCost);
-        $I->selectOption('select[name=default_tax_rate_id]', $itemTaxName . ': ' . $itemTaxRate . '%');
+        $I->selectOption('select[name=tax_select1]', $itemTaxName . ': ' . $itemTaxRate . '%');
         $I->click('Save');
         $I->wait(1);
         //$I->see($productKey);