diff --git a/.travis.yml b/.travis.yml
index 01944c4c..7ef4697d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
+dist: xenial
+services:
+  - xvfb
 sudo: false
 language: node_js
 node_js:
-  - 6
   - 8
   - node
 before_install:
   - ./bin/firefox-allow-popups.sh
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
 script: npm run ci
diff --git a/browser/queue.js b/browser/queue.js
index 55059722..aef40e44 100644
--- a/browser/queue.js
+++ b/browser/queue.js
@@ -8,8 +8,7 @@ var FuncUnit = require("funcunit/browser/core");
  */
 FuncUnit._incallback = false;
 //where we should add things in a callback
-var currentPosition = 0,
-  startedQueue = false;
+var currentPosition = 0;
 
 /**
    * @property FuncUnit.speed F.speed()
@@ -99,14 +98,14 @@ add = function(handler, error, context) {
   if(handler instanceof Function) {
     if(typeof error === 'object') {
       context = error;
-      delete error;
+      error = null;
     }
 
     error = (error && error.toString()) || 'Custom method has failed.';
     var cb = handler;
 
     handler = {
-      method: function(success, error) {
+      method: function(success, error) {		// eslint-disable-line no-unused-vars
         success();
       },
       success: cb,
@@ -143,7 +142,7 @@ var currentEl;
  * @param {Object} selector
  */
 FuncUnit._done = function(el, selector){
-  var next, 
+  var next,
     timer,
     speed = FuncUnit.speed || 0;