diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9f469a546236e7..2b4e05ed0a2f2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,7 +36,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:2019-10-18
+      - image: reactnativecommunity/react-native-android:2020-6-4
     resource_class: "large"
     environment:
       - TERM: "dumb"
diff --git a/scripts/validate-android-test-env.sh b/scripts/validate-android-test-env.sh
index 5f6be9956cba97..131b5c372f901b 100755
--- a/scripts/validate-android-test-env.sh
+++ b/scripts/validate-android-test-env.sh
@@ -44,7 +44,7 @@ if [ -z "$(buck --version)" ]; then
   fi
   exit 1
 else
-  BUCK_EXPECTED_VERSION="buck version d743d2d0229852ce7c029ec257532d8916f6b2b7"
+  BUCK_EXPECTED_VERSION="buck version 2020.05.14.01"
   if [ "$(buck --version)" != "$BUCK_EXPECTED_VERSION" ]; then
     if [ ! -d "/opt/facebook" ]; then
       echo "Warning: The test suite expects ${BUCK_EXPECTED_VERSION} to be installed"
@@ -109,9 +109,9 @@ if [ -n "$(which csrutil)" ]; then
   fi
 fi
 
-if [ -z "$JAVA_HOME" ]; then
-  echo "Error: \$JAVA_HOME is not configured."
-  echo "Try adding export JAVA_HOME=\$(/usr/libexec/java_home) to your .bashrc or equivalent."
-  echo "You will also want to add \$JAVA_HOME/bin to your path."
-  exit 1
-fi
+# if [ -z "$JAVA_HOME" ]; then
+#   echo "Error: \$JAVA_HOME is not configured."
+#   echo "Try adding export JAVA_HOME=\$(/usr/libexec/java_home) to your .bashrc or equivalent."
+#   echo "You will also want to add \$JAVA_HOME/bin to your path."
+#   exit 1
+# fi