diff --git a/test/Makefile b/test/Makefile
index d6d8199a..e2f40651 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -22,11 +22,11 @@ clean:
 	rm -rf build
 
 deploy: build/$(ANDROID_ABI)/runner build/tests.dex build/frida-java.js
-	adb shell "rm -rf $(deploy_data_dir) && mkdir -p $(deploy_data_dir)"
+	adb shell "rm -rf $(deploy_data_dir) && mkdir -p $(deploy_data_dir) && mkdir -p $(deploy_data_dir)/dalvik-cache"
 	adb push $^ $(deploy_data_dir)
 
 run:
-	adb shell $(deploy_data_dir)/runner
+	adb shell "ANDROID_DATA=$(deploy_data_dir) $(deploy_data_dir)/runner"
 
 watch:
 	npm run watch &