diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java
index 43df9b7d..4d111351 100644
--- a/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java
+++ b/buildSrc/src/main/java/com/uber/okbuck/extension/TestExtension.java
@@ -18,7 +18,7 @@ public class TestExtension {
    * Hardcoded in Robolectric
    * https://github.com/robolectric/robolectric/blob/master/robolectric/src/main/java/org/robolectric/plugins/DefaultSdkProvider.java#L50
    */
-  public String robolectricPreinstrumentedVersion = "i3";
+  public String robolectricPreinstrumentedVersion = "i4";
 
   /** Enable generation of espresso test rules. */
   public boolean espresso = false;
diff --git a/tooling/ci/build_cmd.sh b/tooling/ci/build_cmd.sh
index b41d752c..054977a9 100755
--- a/tooling/ci/build_cmd.sh
+++ b/tooling/ci/build_cmd.sh
@@ -11,7 +11,7 @@ SKIP_OKBUCK= ./buckw --version
 echo "Running BUILD_CMD: $BUILD_CMD"
 
 if [ "$BUILD_CMD" = "build" ]; then
-	./buckw targets //... --type android_binary android_instrumentation_apk java_binary | xargs ./buckw build
+	./buckw targets //... --type android_binary android_instrumentation_apk java_binary | xargs ./buckw build && ./gradlew okbuck -Dokbuck.wrapper=true
 elif [ "$BUILD_CMD" = "lint" ]; then
 	./buckw targets //... --type genrule | grep -v lintErrorLibrary | xargs ./buckw build && ./tooling/ci/lint_integration_test.sh
 elif [ "$BUILD_CMD" = "test" ]; then