diff --git a/.travis.yml b/.travis.yml
index 7552a7cd6..4012c1ad4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,19 @@
 language: node_js
+
 node_js: 0.10
-# installs dependencies for testing
-install: npm install -g casperjs@1.1.0-beta3
-# command to run tests
-script: casperjs test tests/headless/run-testsuite.js
+
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+install:
+  - npm install -g http-server
+  - npm install -g slimerjs@0.9.2
+  - npm install -g casperjs@1.1.0-beta3
+
+before_script:
+  - http-server -s -a 0.0.0.0 -p 8080 &
+
+script:
+  - casperjs test tests/headless/run-testsuite.js --host=http://0.0.0.0:8080/
+  - ./tests/run-slimerjs.sh
diff --git a/tests/headless/modules/tawWrapper.js b/tests/headless/modules/tawWrapper.js
index 0da22f887..686ee71b3 100644
--- a/tests/headless/modules/tawWrapper.js
+++ b/tests/headless/modules/tawWrapper.js
@@ -125,7 +125,7 @@ function runOneTestFunc(name, filename) {
                     results.push({
                         pass: false,
                         msg: msg + debugInfo("t.ok", name, filename)
-                    })
+                    });
                 } else {
                     results.push({pass: true, msg: msg});
                 }
diff --git a/tests/headless/run-testsuite.js b/tests/headless/run-testsuite.js
index 9bb8d7ed6..005379a9c 100644
--- a/tests/headless/run-testsuite.js
+++ b/tests/headless/run-testsuite.js
@@ -1,38 +1,25 @@
-var fs = require('fs'),
-    system = require('system'),
-    dash = fs.separator,
-    currentFile = system.args[4], // the full path to run-testsuite.js
-    curFileParts = fs.absolute(currentFile).split(dash);
-
-// remove filename 'run-testsuite.js'
-curFileParts.pop();
-// remove containing folder 'headless' 
-curFileParts.pop();
 
-var basePath = curFileParts.join(dash) + dash;
-var modulePath = basePath  + 'headless' + dash + 'modules' + dash;
-
-// the html file with the links
-var tawListOfTestsFile = basePath + 'list-tests.html';
+var fs = require('fs'),
+    host = casper.cli.has('host') ? casper.cli.get('host') : 'http://localhost:8080/',
+    testsPath = host + 'tests/',
+    tawListOfTestsFile = testsPath + 'list-tests.html',
+    modulesPath = fs.workingDirectory + '/tests/headless/modules/';
 
-var strUtil = require(modulePath + 'strUtil'),
+var strUtil = require(modulesPath + 'strUtil'),
     padLeft = strUtil.padLeft,
     padRight = strUtil.padRight;
 
-var tawWrapper = require(modulePath + 'tawWrapper'),
+var tawWrapper = require(modulesPath + 'tawWrapper'),
     getTestFiles = tawWrapper.getTestFiles,
     getTestFunctions = tawWrapper.getTestFunctions,
     runOneTestFunc = tawWrapper.runOneTestFunc;
 
-
 // the variables we'll fill during the first phase and iterate over in the
 // second phase
-var links = [];
-var funcCnt = 0;
-var results = [];
-var total = 0;
-
-
+var links = [],
+    funcCnt = 0,
+    results = [],
+    total = 0;
 
 // Open the TAW-list of urls
 casper.start(tawListOfTestsFile);
@@ -45,7 +32,7 @@ casper.then(function() {
 casper.then(function() {
     links.forEach(function(link) {
         var funcs;
-        casper.thenOpen(basePath + link, function(){
+        casper.thenOpen(testsPath + link, function(){
             funcs = this.evaluate(getTestFunctions);
         });
         casper.then(function() {
@@ -62,7 +49,7 @@ casper.then(function() {
                 );
             }, this);
         });
-        
+
     });
 });
 
@@ -77,7 +64,7 @@ casper.then(function(){
                 } else {
                     var message = padLeft((++cnt), 4) + ") " + result.msg;
                     if (result.skip) {
-                        test.skip(1, message)
+                        test.skip(1, message);
                     } else {
                         test.assert(result.pass, message);
                     }
@@ -89,4 +76,4 @@ casper.then(function(){
     
 });
 
-casper.run();
\ No newline at end of file
+casper.run();
diff --git a/tests/run-slimerjs.sh b/tests/run-slimerjs.sh
new file mode 100755
index 000000000..021984c89
--- /dev/null
+++ b/tests/run-slimerjs.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+casperjs --engine=slimerjs test tests/headless/run-testsuite.js --host=http://0.0.0.0:8080/ | tee slimerjs.log
+
+# Figure out the exit code ourselves because Gecko does not allow
+# SlimerJS to do so for now.
+[ -z "`grep ' 0 failed.' slimerjs.log`" ] && ERROR=1
+rm slimerjs.log
+exit $ERROR