diff --git a/.travis.yml b/.travis.yml
index 2d57f3d48..833251b12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,7 @@ addons:
     packages:
     - realpath
     - xvfb
-before_install:
-- echo $ANDROID_HOME
-- git clone --depth=1 https://github.com/secure-software-engineering/DroidBench.git /tmp/DroidBench
-- source "travis/before-install-$BUILD_SYSTEM"
+before_install: source "travis/before-install-$BUILD_SYSTEM"
 install: source "travis/install-$BUILD_SYSTEM"
 script: source "travis/script-$BUILD_SYSTEM"
 before_cache: source "travis/before-cache-$BUILD_SYSTEM"
diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle
index d06375d24..1db81e503 100644
--- a/com.ibm.wala.dalvik.test/build.gradle
+++ b/com.ibm.wala.dalvik.test/build.gradle
@@ -18,3 +18,22 @@ dependencies {
 		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
 		)
 }
+
+task cloneDroidBench(type: Exec) {
+	// TODO: download to somewhere private to this build tree; update code that looks in "/tmp" accordingly
+	def destDir = '/tmp/DroidBench'
+	inputs.property('repository', 'https://github.com/secure-software-engineering/DroidBench.git')
+	outputs.dirs destDir
+	doFirst { delete destDir }
+	commandLine 'git', 'clone', '--depth=1', inputs.properties.repository, destDir
+	// TODO: should check out a specific tag or hash
+}
+
+processTestResources {
+	dependsOn cloneDroidBench
+
+	def testdata = project(':com.ibm.wala.core.testdata')
+	dependsOn testdata.verifyJavaCup
+	from testdata.collectJLex
+	from testdata.downloadJavaCup
+}
diff --git a/travis/before-install-maven b/travis/before-install-maven
index e235bc375..c0fd55a8c 100644
--- a/travis/before-install-maven
+++ b/travis/before-install-maven
@@ -1,5 +1,7 @@
 # -*- mode: sh; sh-shell: sh -*-
 
+git clone --depth=1 https://github.com/secure-software-engineering/DroidBench.git /tmp/DroidBench
+
 export M2_HOME=$HOME/apache-maven-3.5.0
 
 if [ ! -d $M2_HOME/bin ]; then