diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index d8538df673..e9ca7dca30 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -7,6 +7,11 @@
 # This setup needs to be run as a user that can run sudo.
 TOOLSDIR=$(dirname $0)
 
+# Config Zookeeper to run on tmpfs
+sudo service zookeeper stop
+DATADIR=$(sed -n -e 's/^dataDir=//p' /etc/zookeeper/conf/zoo.cfg)
+sudo mount -t tmpfs -o nodev,nosuid,size=500M none $DATADIR
+
 # Be sure mysql and zookeeper are started.
 sudo service mysql start
 sudo service postgresql start