diff --git a/.travis.yml b/.travis.yml
index 6c2e6f8b4..ff3d7a629 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,11 +13,10 @@ env:
     matrix:
         - FIREFOX_RELEASE='nightly-latest'
         - FIREFOX_RELEASE='aurora-latest'
-        #- FIREFOX_RELEASE='latest'
-        - FIREFOX_RELEASE='47.0'
+        - FIREFOX_RELEASE='beta-linux64-add-on-devel'
+        - FIREFOX_RELEASE='release-linux64-add-on-devel'
         - FIREFOX_RELEASE='43.0'
         - FIREFOX_RELEASE='esr-latest'
-        #- FIREFOX_RELEASE='nightly'
 matrix:
     fast_finish: true
     allow_failures:
@@ -31,8 +30,12 @@ before_script:
     - npm install
     - npm install grunt -g
     - npm install grunt-cli -g
-    - test $FIREFOX_RELEASE = nightly || aria2c -o firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US"
-    - test $FIREFOX_RELEASE != nightly || aria2c -o firefox-$FIREFOX_RELEASE.tar.bz2 "https://archive.mozilla.org`curl -s https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/ | grep -E '/pub/firefox/nightly/latest-mozilla-central/firefox-[^\"]+.linux-x86_64.tar.bz2' -o | sort | tail -1`"
+    - test $FIREFOX_RELEASE != nightly-latest               || aria2c -o firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US"
+    - test $FIREFOX_RELEASE != aurora-latest                || aria2c -o firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US"
+    - test $FIREFOX_RELEASE != beta-linux64-add-on-devel    || bash test/fetch-unbranded.sh $FIREFOX_RELEASE
+    - test $FIREFOX_RELEASE != release-linux64-add-on-devel || bash test/fetch-unbranded.sh $FIREFOX_RELEASE
+    - test $FIREFOX_RELEASE != '43.0'                       || aria2c -o firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US"
+    - test $FIREFOX_RELEASE != esr-latest                   || aria2c -o firefox-$FIREFOX_RELEASE.tar.bz2 "https://download.mozilla.org/?product=firefox-$FIREFOX_RELEASE&os=linux64&lang=en-US"
     - tar xvf firefox-$FIREFOX_RELEASE.tar.bz2
     - sh -e /etc/init.d/xvfb start
 script:
diff --git a/test/fetch-unbranded.sh b/test/fetch-unbranded.sh
new file mode 100644
index 000000000..aea722614
--- /dev/null
+++ b/test/fetch-unbranded.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+BUILD_TYPE=${1:-$FIREFOX_RELEASE}
+echo "Looking up latest URL for $BUILD_TYPE"
+BUILD_ROOT="/pub/firefox/tinderbox-builds/mozilla-${BUILD_TYPE}/"
+ROOT="https://archive.mozilla.org"
+LATEST=$(curl -s "$ROOT$BUILD_ROOT" | grep $BUILD_TYPE | grep -Po '<a href=".+">\K[[:digit:]]+' | sort -n | tail -1)
+FILE=$(curl -s "$ROOT$BUILD_ROOT$LATEST/" | grep '.tar.' | grep -Po '<a href="\K[^"]*')
+echo "URL: $ROOT$FILE"
+exec aria2c -q -o "firefox-${BUILD_TYPE}.tar.bz2" "$ROOT$FILE"