diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index a0df8d4636..e3e47aed70 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -56,6 +56,8 @@ def setup_complete(args=None):
 			pass
 
 def update_setup_wizard_access():
+	if frappe.flags.in_test:
+		return
 	setup_wizard = frappe.get_doc('Page', 'setup-wizard')
 	for roles in setup_wizard.roles:
 		if roles.role == 'System Manager':
diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py
index 6eb8e49789..528223151c 100644
--- a/erpnext/shopping_cart/test_shopping_cart.py
+++ b/erpnext/shopping_cart/test_shopping_cart.py
@@ -131,9 +131,6 @@ class TestShoppingCart(unittest.TestCase):
 			"taxes": frappe.get_doc("Sales Taxes and Charges Template", "_Test Tax 1").taxes,
 			"company": "_Test Company"
 		}
-		
-		for d in values["taxes"]:
-			d.name = None
 
 		quotation.update(values)