diff --git a/appveyor.yml b/appveyor.yml
index 12a687b3d..4cfb9e5e6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,5 @@
-skip_tags: true
 init:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/bitwarden/mobile/master/install-android26.ps1'))
-on_finish:
-  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 before_build:
   - nuget restore
   - IF DEFINED keystore_dec_secret nuget install secure-file -ExcludeVersion
@@ -20,4 +16,5 @@ artifacts:
 branches:
   except:
     - l10n_master
+skip_tags: true
 image: Visual Studio 2017
diff --git a/test/Android.Test/Android.Test.csproj b/test/Android.Test/Android.Test.csproj
index 6afe7e168..c9451577d 100644
--- a/test/Android.Test/Android.Test.csproj
+++ b/test/Android.Test/Android.Test.csproj
@@ -132,6 +132,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\shield.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\xml\autofillservice.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/test/Android.Test/Resources/Resource.Designer.cs b/test/Android.Test/Resources/Resource.Designer.cs
index 1bde9978a..0123d1f58 100644
--- a/test/Android.Test/Resources/Resource.Designer.cs
+++ b/test/Android.Test/Resources/Resource.Designer.cs
@@ -4252,6 +4252,9 @@ namespace Bit.Android.Test
 			// aapt resource value: 0x7f050000
 			public const int accessibilityservice = 2131034112;
 			
+			// aapt resource value: 0x7f050001
+			public const int autofillservice = 2131034113;
+			
 			static Xml()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
diff --git a/test/Android.Test/Resources/xml/autofillservice.xml b/test/Android.Test/Resources/xml/autofillservice.xml
new file mode 100644
index 000000000..422e6f3e4
--- /dev/null
+++ b/test/Android.Test/Resources/xml/autofillservice.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<autofill-service
+    xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file