diff --git a/.travis.yml b/.travis.yml
index a626c32cf1..b88ffdf326 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,13 @@ cache:
     - core/client/node_modules
     - core/client/bower_components
 addons:
+  firefox: "latest"
   postgresql: "9.3"
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
 env:
   global:
     - GITHUB_OAUTH_KEY=003a44d58f12089d0c0261338298af3813330949
@@ -28,15 +34,10 @@ matrix:
     - node_js: "0.10"
       env: TEST_SUITE=lint
 before_install:
-  # - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - mkdir travis-phantomjs
-  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
-  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
-  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
   - if [ $DB == "mysql" ]; then mysql -e 'create database ghost_testing'; fi
   - if [ $DB == "pg" ]; then psql -c 'create database ghost_testing;' -U postgres; fi
 before_script:
-  - phantomjs --version
+  - if [ $TEST_SUITE == "client" ]; then export DISPLAY=:99; sh -e /etc/init.d/xvfb start; sleep 3; fi
 after_success:
   - |
       if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
diff --git a/core/client/testem.json b/core/client/testem.json
index 6280a9793b..79d466a5cd 100644
--- a/core/client/testem.json
+++ b/core/client/testem.json
@@ -3,10 +3,11 @@
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "Chrome",
+    "Firefox"
   ],
   "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
+    "Chrome",
+    "Firefox"
   ]
 }
diff --git a/core/client/tests/acceptance/posts/post-test.js b/core/client/tests/acceptance/posts/post-test.js
index 267161e58f..17cd403f68 100644
--- a/core/client/tests/acceptance/posts/post-test.js
+++ b/core/client/tests/acceptance/posts/post-test.js
@@ -41,12 +41,13 @@ describe('Acceptance: Posts - Post', function() {
             visit('/');
 
             andThen(() => {
-                // it redirects to first post
-                expect(currentURL(), 'currentURL').to.equal(`/${posts[0].id}`);
-
-                expect(find('.posts-list li').first().hasClass('active'), 'highlights latest post').to.be.true;
-
                 expect(find('.posts-list li').length, 'post list count').to.equal(3);
+
+                // if we're in "desktop" size, we should redirect and highlight
+                if (find('.content-preview:visible').length) {
+                    expect(currentURL(), 'currentURL').to.equal(`/${posts[0].id}`);
+                    expect(find('.posts-list li').first().hasClass('active'), 'highlights latest post').to.be.true;
+                }
             });
         });
 
diff --git a/core/client/tests/acceptance/settings/tags-test.js b/core/client/tests/acceptance/settings/tags-test.js
index 71bd4f11f0..35334c4b3a 100644
--- a/core/client/tests/acceptance/settings/tags-test.js
+++ b/core/client/tests/acceptance/settings/tags-test.js
@@ -267,7 +267,9 @@ describe('Acceptance: Settings - Tags', function () {
                 find('.tag-list').scrollTop(find('.tag-list-content').height());
             });
 
-            wait().then(() => {
+            triggerEvent('.tag-list', 'scroll');
+
+            andThen(() => {
                 // it loads the second page
                 expect(find('.settings-tags .settings-tag').length, 'tag list count on second load')
                     .to.equal(30);
@@ -275,7 +277,9 @@ describe('Acceptance: Settings - Tags', function () {
                 find('.tag-list').scrollTop(find('.tag-list-content').height());
             });
 
-            wait().then(() => {
+            triggerEvent('.tag-list', 'scroll');
+
+            andThen(() => {
                 // it loads the final page
                 expect(find('.settings-tags .settings-tag').length, 'tag list count on third load')
                     .to.equal(32);
diff --git a/core/client/tests/index.html b/core/client/tests/index.html
index f0e8a6729d..b7426ce0ad 100644
--- a/core/client/tests/index.html
+++ b/core/client/tests/index.html
@@ -33,6 +33,13 @@
         #ember-testing > div {
             height: 100%;
         }
+        /* fix firefox not supporting `zoom: 50%` */
+        _::-moz-range-track, body:last-child #ember-testing {
+            -moz-transform-origin: 0 0;
+            -moz-transform: scale(0.5);
+            width: 200%;
+            height: 200%;
+        }
     </style>
   </head>
   <body>