diff --git a/Directory.Packages.props b/Directory.Packages.props
index 22035374d..70c2696fe 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,11 +9,11 @@
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NUnit" Version="3.14.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.0" />
-	<PackageVersion Include="NunitXml.TestLogger" Version="3.1.15" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="NunitXml.TestLogger" Version="3.1.15" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
-    <PackageVersion Include="Xamarin.UITest" Version="4.4.0" />
+    <PackageVersion Include="Xamarin.UITest" Version="4.3.5" />
 
     <PackageVersion Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
     <PackageVersion Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
diff --git a/build/scripts/android-uitest-run.sh b/build/scripts/android-uitest-run.sh
index 5220c98c5..dcc9dbe6d 100644
--- a/build/scripts/android-uitest-run.sh
+++ b/build/scripts/android-uitest-run.sh
@@ -18,16 +18,14 @@ export ANDROID_SIMULATOR_APILEVEL=28
 export ANDROID_HOME=$BUILD_SOURCESDIRECTORY/build/android-sdk
 export ANDROID_SDK_ROOT=$BUILD_SOURCESDIRECTORY/build/android-sdk
 export CMDLINETOOLS=commandlinetools-mac-8512546_latest.zip
-mkdir -p $ANDROID_HOME
-wget https://dl.google.com/android/repository/$CMDLINETOOLS
-unzip $CMDLINETOOLS -d $ANDROID_HOME/cmdline-tools
-rm $CMDLINETOOLS
-mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest
 
-if [[ -f $ANDROID_HOME/platform-tools/platform-tools/adb ]]
+if [[ ! -d $ANDROID_HOME ]];
 then
-	# It appears that the platform-tools 29.0.6 are extracting into an incorrect path
-	mv $ANDROID_HOME/platform-tools/platform-tools/* $ANDROID_HOME/platform-tools
+	mkdir -p $ANDROID_HOME
+	wget https://dl.google.com/android/repository/$CMDLINETOOLS
+	unzip $CMDLINETOOLS -d $ANDROID_HOME/cmdline-tools
+	rm $CMDLINETOOLS
+	mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest
 fi
 
 AVD_NAME=xamarin_android_emulator