diff --git a/build.gradle b/build.gradle
index cdabc112b7..9beeb9de6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,6 @@ buildscript {
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
         classpath 'com.karumi:shot:5.11.2'
-        classpath 'com.facebook.testing.screenshot:plugin:0.14.0'
     }
 }
 
@@ -39,7 +38,6 @@ apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.github.spotbugs'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 apply plugin: 'shot'
-apply plugin: 'com.facebook.testing.screenshot'
 
 println "Gradle uses Java ${Jvm.current()}"
 
@@ -378,6 +376,7 @@ dependencies {
     androidTestImplementation "net.bytebuddy:byte-buddy-android:$byteBuddyVersion"
     androidTestImplementation "io.mockk:mockk-android:1.10.4"
     androidTestImplementation 'androidx.arch.core:core-testing:2.0.1'
+    androidTestImplementation "com.facebook.testing.screenshot:core:0.13.0"
 
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
     // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
diff --git a/scripts/androidScreenshotTest b/scripts/androidScreenshotTest
index f4e1bd5a47..97c6267893 100755
--- a/scripts/androidScreenshotTest
+++ b/scripts/androidScreenshotTest
@@ -57,7 +57,7 @@ while read line ; do
     fi
 done < <(adb devices | cut -f1)
 
-if [ ! $emulatorIsRunning ] ; then
+if [ "$emulatorIsRunning" == false ] ; then
     emulator -writable-system -avd uiComparison -no-snapshot -gpu swiftshader_indirect -no-audio -skin 500x833 &
 fi