diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py
index a5285ea..3d96f23 100644
--- a/erpnext/accounts/doctype/subscription/test_subscription.py
+++ b/erpnext/accounts/doctype/subscription/test_subscription.py
@@ -41,24 +41,14 @@
 		plan.billing_interval_count = 14
 		plan.insert()
 
-
-def create_subscriber():
-	if not frappe.db.exists('Subscriber', '_Test Customer'):
-		subscriber = frappe.new_doc('Subscriber')
-		subscriber.subscriber_name = '_Test Customer'
-		subscriber.customer = '_Test Customer'
-		subscriber.insert()
-
-
 class TestSubscription(unittest.TestCase):
 
 	def setUp(self):
 		create_plan()
-		create_subscriber()
 
 	def test_create_subscription_with_trial_with_correct_period(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.trial_period_start = nowdate()
 		subscription.trial_period_end = add_days(nowdate(), 30)
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
@@ -75,7 +65,7 @@
 
 	def test_create_subscription_without_trial_with_correct_period(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
@@ -91,7 +81,7 @@
 
 	def test_create_subscription_trial_with_wrong_dates(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.trial_period_end = nowdate()
 		subscription.trial_period_start = add_days(nowdate(), 30)
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
@@ -101,7 +91,7 @@
 
 	def test_create_subscription_multi_with_different_billing_fails(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.trial_period_end = nowdate()
 		subscription.trial_period_start = add_days(nowdate(), 30)
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
@@ -112,7 +102,7 @@
 
 	def test_invoice_is_generated_at_end_of_billing_period(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.start = '2018-01-01'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.insert()
@@ -129,7 +119,7 @@
 
 	def test_status_goes_back_to_active_after_invoice_is_paid(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -159,7 +149,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -182,7 +172,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -200,7 +190,7 @@
 
 	def test_subscription_invoice_days_until_due(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.days_until_due = 10
 		subscription.start = add_months(nowdate(), -1)
@@ -218,7 +208,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -242,7 +232,7 @@
 
 	def test_subscription_remains_active_during_invoice_period(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.process()		# no changes expected
@@ -268,7 +258,7 @@
 
 	def test_subscription_cancelation(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
@@ -284,7 +274,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
@@ -319,7 +309,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
@@ -339,7 +329,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
@@ -363,7 +353,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -397,7 +387,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -434,7 +424,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
@@ -463,7 +453,7 @@
 
 	def test_restart_active_subscription(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
@@ -473,7 +463,7 @@
 
 	def test_subscription_invoice_discount_percentage(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.additional_discount_percentage = 10
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
@@ -488,7 +478,7 @@
 
 	def test_subscription_invoice_discount_amount(self):
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.additional_discount_amount = 11
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
@@ -505,7 +495,7 @@
 		# Create a non pre-billed subscription, processing should not create
 		# invoices.
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.process()
@@ -527,7 +517,7 @@
 		settings.save()
 
 		subscription = frappe.new_doc('Subscription')
-		subscription.subscriber = '_Test Customer'
+		subscription.customer = '_Test Customer'
 		subscription.generate_invoice_at_period_start = True
 		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()