diff --git a/build.gradle b/build.gradle
index 53917379980..a9c5a39495e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,7 @@ ext.deps = [
         inferAnnotations   : 'com.facebook.infer.annotation:infer-annotation:0.17.0',
         // Debugging and testing
         guava              : 'com.google.guava:guava:20.0',
-        robolectric        : 'org.robolectric:robolectric:3.0',
+        robolectric        : 'org.robolectric:robolectric:3.8',
         junit              : 'junit:junit:4.12',
         hamcrestLibrary    : 'org.hamcrest:hamcrest-library:1.3',
         powermockMockito   : 'org.powermock:powermock-api-mockito:1.5.6',
diff --git a/litho-it-powermock/build.gradle b/litho-it-powermock/build.gradle
index 359a98d0c7b..e881e4f3de7 100644
--- a/litho-it-powermock/build.gradle
+++ b/litho-it-powermock/build.gradle
@@ -53,6 +53,7 @@ dependencies {
     testImplementation deps.assertjCore
     testImplementation deps.guava
     testImplementation deps.inferAnnotations
+    testImplementation deps.junit
     testImplementation deps.powermockJunit
     testImplementation deps.powermockMockito
     testImplementation deps.powermockXstream
diff --git a/litho-it-spec/build.gradle b/litho-it-spec/build.gradle
index f673a494931..3015792095f 100644
--- a/litho-it-spec/build.gradle
+++ b/litho-it-spec/build.gradle
@@ -58,6 +58,7 @@ dependencies {
 
     // Testing deps
     testImplementation deps.assertjCore
+    testImplementation deps.junit
     testImplementation deps.robolectric
 }
 
diff --git a/litho-it/build.gradle b/litho-it/build.gradle
index 96c4147c339..a0b991ff4e2 100644
--- a/litho-it/build.gradle
+++ b/litho-it/build.gradle
@@ -40,6 +40,8 @@ android {
 
     testOptions {
         unitTests.all {
+            systemProperty 'robolectric.dependency.repo.url', 'https://repo1.maven.org/maven2'
+
             jvmArgs '-Dcom.facebook.litho.is_oss=true'
             testLogging {
                 events "passed", "skipped", "failed", "standardOut", "standardError"
diff --git a/litho-it/src/test/java/com/facebook/litho/ComponentsPoolsTest.java b/litho-it/src/test/java/com/facebook/litho/ComponentsPoolsTest.java
index 1bb5e0254a8..a2dfaca0d34 100644
--- a/litho-it/src/test/java/com/facebook/litho/ComponentsPoolsTest.java
+++ b/litho-it/src/test/java/com/facebook/litho/ComponentsPoolsTest.java
@@ -34,7 +34,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ActivityController;
+import org.robolectric.android.controller.ActivityController;
 
 @RunWith(ComponentsTestRunner.class)
 public class ComponentsPoolsTest {
diff --git a/litho-testing/src/main/java/com/facebook/litho/testing/shadows/ColorDrawableShadow.java b/litho-testing/src/main/java/com/facebook/litho/testing/shadows/ColorDrawableShadow.java
index bbd007247a2..adafac08eb5 100644
--- a/litho-testing/src/main/java/com/facebook/litho/testing/shadows/ColorDrawableShadow.java
+++ b/litho-testing/src/main/java/com/facebook/litho/testing/shadows/ColorDrawableShadow.java
@@ -16,7 +16,7 @@
 
 package com.facebook.litho.testing.shadows;
 
-import static org.robolectric.internal.Shadow.directlyOn;
+import static org.robolectric.shadow.api.Shadow.directlyOn;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
diff --git a/litho-testing/src/main/java/com/facebook/litho/testing/testrunner/ComponentsTestRunner.java b/litho-testing/src/main/java/com/facebook/litho/testing/testrunner/ComponentsTestRunner.java
index caca1d9f684..dd7dbb8655f 100644
--- a/litho-testing/src/main/java/com/facebook/litho/testing/testrunner/ComponentsTestRunner.java
+++ b/litho-testing/src/main/java/com/facebook/litho/testing/testrunner/ComponentsTestRunner.java
@@ -96,11 +96,8 @@ public Config getConfig(final Method method) {
     final Config config = super.getConfig(method);
     // We are hard-coding the path here instead of relying on BUCK internals
     // to allow for building with gradle in the Open Source version.
-    return new Config.Implementation(config) {
-      @Override
-      public String manifest() {
-        return getResPrefix() + "AndroidManifest.xml";
-      }
-    };
+    return new Config.Implementation.Builder(config)
+        .setManifest(getResPrefix() + "AndroidManifest.xml")
+        .build();
   }
 }