diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8a1928f..6fbec3f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
+      - name: Build OkBuck
+        run: ./gradlew okbuck -Dokbuck.wrapper=true --stacktrace
       - name: Run ${{ matrix.build_cmd }}
         run: ./tooling/ci/build_cmd.sh ${{ matrix.build_cmd }}
       - name: Upload snapshot
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..a5a7be51 100755
--- a/tooling/ci/build_cmd.sh
+++ b/tooling/ci/build_cmd.sh
@@ -6,7 +6,7 @@ if [ -z "$BUILD_CMD" ]; then
 	exit 1
 fi
 
-SKIP_OKBUCK= ./buckw --version
+export SKIP_OKBUCK=$(./buckw --version)
 
 echo "Running BUILD_CMD: $BUILD_CMD"