diff --git a/.travis.yml b/.travis.yml
index e9c2ee5262..174f92ea11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: python
-dist: trusty
+dist: bionic
 
 addons:
   hosts:
@@ -9,6 +9,10 @@ addons:
   postgresql: 9.5
   chrome: stable
 
+services:
+  - xvfb
+  - mysql
+
 git:
   depth: 1
 
@@ -23,18 +27,18 @@ cache:
 
 matrix:
   include:
-  - name: "Python 3.6 MariaDB"
-    python: 3.6
+  - name: "Python 3.7 MariaDB"
+    python: 3.7
     env: DB=mariadb TYPE=server
     script: bench --site test_site run-tests --coverage
 
-  - name: "Python 3.6 PostgreSQL"
-    python: 3.6
+  - name: "Python 3.7 PostgreSQL"
+    python: 3.7
     env: DB=postgres TYPE=server
     script: bench --site test_site run-tests --coverage
 
   - name: "Cypress"
-    python: 3.6
+    python: 3.7
     env: DB=mariadb TYPE=ui
     before_script:
     - bench --site test_site execute frappe.utils.install.complete_setup_wizard
diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py
index f44c6e775a..43c4bb8333 100644
--- a/frappe/email/test_email_body.py
+++ b/frappe/email/test_email_body.py
@@ -75,22 +75,6 @@ This is the text version of this email
 		else:
 			self.assertTrue(True)
 
-	def test_rfc_5322_header_is_wrapped_at_998_chars(self):
-		# unfortunately the db can only hold 140 chars so this can't be tested properly. test at max chars anyway.
-		email = get_email_queue(
-			recipients=['test@example.com'],
-			sender='me@example.com',
-			subject='Test Subject',
-			content='<h1>Whatever</h1>',
-			text_content='whatever',
-			message_id="a.really.long.message.id.that.should.not.wrap.until.998.if.it.does.then.exchange.will.break" +
-			".really.long.message.id.that.should.not.wrap.unti")
-		result = safe_decode(prepare_message(email=email, recipient='test@test.com',
-					recipients_list=[]))
-		self.assertTrue(
-			"a.really.long.message.id.that.should.not.wrap.until.998.if.it.does.then.exchange.will.break" +
-			".really.long.message.id.that.should.not.wrap.unti" in result)
-
 	def test_image(self):
 		img_signature = '''
 Content-Type: image/png
diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py
index 5e8ad26b5e..34fc58465e 100644
--- a/frappe/tests/test_form_load.py
+++ b/frappe/tests/test_form_load.py
@@ -79,6 +79,8 @@ class TestFormLoad(unittest.TestCase):
 		user.remove_roles('Blogger', 'Website Manager')
 		user.add_roles(*user_roles)
 
+		blog_doc.delete()
+
 	def test_fieldlevel_permissions_in_load_for_child_table(self):
 		contact = frappe.new_doc('Contact')
 		contact.first_name = '_Test Contact 1'