diff --git a/android/build.gradle b/android/build.gradle
index 1679fc0f..577ab4dd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -17,7 +17,7 @@ apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 25
-  buildToolsVersion "23.0.3"
+  buildToolsVersion "25.0.2"
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion 26
diff --git a/buddybuild_postclone.sh b/buddybuild_postclone.sh
index 0456e305..132225f9 100644
--- a/buddybuild_postclone.sh
+++ b/buddybuild_postclone.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 # Copy firebase lib into tests directory
-cp -R $(node --eval "console.log(require('path').resolve('./lib'));")/* $(node --eval "console.log(require('path').resolve('./tests/firebase'));")/
+mkdir tests/firebase
+cp -R lib/* tests/firebase/*
 
 # Install /tests npm packages
 cd tests && npm install