diff --git a/bin/travis-build b/bin/travis-build
index ef1f176115a..2c36f8dc797 100755
--- a/bin/travis-build
+++ b/bin/travis-build
@@ -32,7 +32,7 @@ python setup.py develop
 sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' test-core.ini
 sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' test-core.ini
 sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@\/ckan_test/' test-core.ini
-sed -i -e 's/.*datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@\/datastore/' test-core.ini
+sed -i -e 's/^datastore.write_url.*/ckan.datastore.write_url = postgresql:\/\/postgres@\/datastore/' test-core.ini
 
 # Configure Solr
 echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
@@ -52,5 +52,10 @@ then
   paster datastore set-permissions postgres -c test-core.ini
 fi
 
+if [ $PGVERSION == '8.4' ]
+then
+  sed -i -e 's/.*datastore.read_url.*//' test-core.ini
+fi
+
 # And finally, run the tests
 nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext