diff --git a/Configuration.props b/Configuration.props
index a560bbe2dc6..664f1b35394 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -116,7 +116,7 @@
     <XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">b2be9c80582174e645d3736daa0d44d8610b38a8.</XAPlatformToolsPackagePrefix>
     <XAPlatformToolsVersion>30.0.2</XAPlatformToolsVersion>
     <XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
-    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.2.0</XABundleToolVersion>
+    <XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.4.0</XABundleToolVersion>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != '' ">$(NUGET_PACKAGES)</XAPackagesDir>
     <XAPackagesDir Condition=" '$(XAPackagesDir)' == '' ">$(XamarinAndroidSourcePath)\packages</XAPackagesDir>
     <PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>
diff --git a/Documentation/release-notes/bundletool-1.4.0.md b/Documentation/release-notes/bundletool-1.4.0.md
new file mode 100644
index 00000000000..778d4e2e157
--- /dev/null
+++ b/Documentation/release-notes/bundletool-1.4.0.md
@@ -0,0 +1,8 @@
+### bundletool version update to 1.4.0
+
+The version of the [`bundletool`][bundletool] executable included in
+Xamarin.Android has been updated from 1.2.0 to [1.4.0][bundletool-1.4.0],
+bringing in several improvements and bug fixes.
+
+[bundletool]: https://developer.android.com/studio/command-line/bundletool
+[bundletool-1.4.0]: https://github.com/google/bundletool/releases/tag/1.4.0
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
index 01990fc31ce..4fc28abfcf9 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
@@ -48,7 +48,7 @@ protected override async Task<bool> Execute (Context context)
 				// BCL: Runs BCL tests on emulator
 				// TimeZone: Runs timezone unit tests on emulator
 				// Designer: Runs designer integration tests
-				if (file == ".external") {
+				if (file == ".external" || file == "Configuration.props") {
 					testAreas.Add ("MSBuild");
 					testAreas.Add ("MSBuildDevice");
 					testAreas.Add ("BCL");