diff --git a/.travis.yml b/.travis.yml
index abeb101e7c5..14020b98f8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: required
+sudo: false
 dist: trusty
 language: node_js
 node_js:
diff --git a/test/functional/databases.test.js b/test/functional/databases.test.js
index 2c9acc110aa..c3dfea73ff2 100644
--- a/test/functional/databases.test.js
+++ b/test/functional/databases.test.js
@@ -39,15 +39,6 @@ describe('#databases', function() {
       });
     });
 
-    after(function(done) {
-      dataService.connect(function() {
-        dataService.dropDatabase('music', function() {
-          dataService.disconnect();
-          done();
-        });
-      });
-    });
-
     context('when the escape key is pressed', function() {
       it('closes the create databases modal', function() {
         return client
diff --git a/test/functional/schema.test.js b/test/functional/schema.test.js
index 8573631c5c8..cc02eb3c358 100644
--- a/test/functional/schema.test.js
+++ b/test/functional/schema.test.js
@@ -62,8 +62,6 @@ describe('#schema', function() {
 
     it('shows a schema on refresh', function() {
       return client
-        .clickDatabaseInSidebar('music')
-        .waitForSidebar('collection')
         .goToCollection('music', 'artists')
         .clickApplyFilterButtonFromSchemaTab()
         .waitForStatusBar()
diff --git a/test/functional/support/spectron-support.js b/test/functional/support/spectron-support.js
index 0c7fdaf0014..eac85eef431 100644
--- a/test/functional/support/spectron-support.js
+++ b/test/functional/support/spectron-support.js
@@ -65,11 +65,13 @@ function launchCompass() {
  * Call quitCompass in afterEach for all UI tests:
 
  * @param {Object} app - The running application
- * @param {Function} done - The callback to execute when finished.
  *
- * @returns {Promise}    Promise that resolves when app stops.
+ * @returns {Promise}    Promise that resolves when app stops or is undefined.
  */
 function quitCompass(app) {
+  if (app === undefined || app === null) {
+    return Promise.resolve();
+  }
   return app.quit();
 }