diff --git a/test/setup_travis.sh b/test/setup_travis.sh
index 76f710d9dad3..53e4c747cd37 100755
--- a/test/setup_travis.sh
+++ b/test/setup_travis.sh
@@ -17,11 +17,14 @@ function setup_chrome {
 }
 
 function setup_firefox {
-    #version=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | grep tag_name | cut -d '"' -f 4)
-    # hard-code latest version, since apparently the above `curl` is fucking up in travis
-    version="v0.26.0"
-    url="https://github.com/mozilla/geckodriver/releases/download/${version}/geckodriver-${version}-linux64.tar.gz"
-    wget -O /tmp/geckodriver.tar.gz ${url}
+    # install the latest version of geckodriver (per Github release API)
+    firefox_version=$("${BROWSER}" -version)
+    geckodriver_version=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | grep tag_name | cut -d '"' -f 4)
+    geckodriver_url="https://github.com/mozilla/geckodriver/releases/download/${geckodriver_version}/geckodriver-${geckodriver_version}-linux64.tar.gz"
+
+    echo "Setting up geckodriver ${geckodriver_version} for ${firefox_version}"
+
+    wget -O /tmp/geckodriver.tar.gz ${geckodriver_url}
     sudo tar -xvf /tmp/geckodriver.tar.gz -C /usr/local/bin/
     sudo chmod a+x /usr/local/bin/geckodriver
 }