diff --git a/.travis.yml b/.travis.yml
index 4bdcc265fb53..20a66e5b56c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ before_script:
   # Start webserver on ninja.dev:8000
   - php artisan serve --host=ninja.dev --port=8000 & # '&' allows to run in background
   # Start PhantomJS
-  - phantomjs --webdriver=4444 & # '&' allows to run in background
+  #- phantomjs --webdriver=4444 & # '&' allows to run in background
   # Give it some time to start
   - sleep 5
   # Make sure the app is up-to-date
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index 4a152dce6eff..56b0928116f9 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -12,7 +12,7 @@ modules:
             host: 127.0.0.1
             window_size: 1024x768
             wait: 5
-            browser: phantomjs
+            browser: firefox
             capabilities:
                 unexpectedAlertBehaviour: 'accept'
                 webStorageEnabled: true