diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs
deleted file mode 100644
index 3c2efee3c7d..00000000000
--- a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Prepare
-{
-	[Scenario (isDefault: false)]
-	partial class Scenario_AndroidTestDependencies : ScenarioNoStandardEndSteps
-	{
-		public Scenario_AndroidTestDependencies () 
-			: base ("AndroidTestDependencies", "Install Android SDK and .NET preview test dependencies.")
-		{}
-
-		protected Scenario_AndroidTestDependencies (string name, string description) 
-			: base (name, description)
-		{}
-
-		protected override void AddSteps (Context context)
-		{
-			// disable installation of missing programs...
-			context.SetCondition (KnownConditions.AllowProgramInstallation, false);
-
-			// ...but do not signal an error when any are missing
-			context.SetCondition (KnownConditions.IgnoreMissingPrograms, true);
-		}
-	}
-}
diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_EmulatorTestDependencies.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_EmulatorTestDependencies.cs
deleted file mode 100644
index 9aeababa4a6..00000000000
--- a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_EmulatorTestDependencies.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Xamarin.Android.Prepare
-{
-	[Scenario (isDefault: false)]
-	partial class Scenario_EmulatorTestDependencies : Scenario_AndroidTestDependencies
-	{
-		public Scenario_EmulatorTestDependencies () 
-			: base ("EmulatorTestDependencies", "Install Android SDK (with emulator) and .NET preview test dependencies.")
-		{}
-	}
-}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/GradleCLI.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/GradleCLI.cs
index 811431d673e..4fd0a0ab61d 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/GradleCLI.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/GradleCLI.cs
@@ -19,7 +19,7 @@ public class GradleCLI
 		public bool Execute (params string [] args)
 		{
 			if (!File.Exists (GradlePath)) {
-				throw new FileNotFoundException ($"Gradle tool was found at {GradlePath}, please run the xaprepare 'AndroidTestDependencies' scenario.");
+				throw new FileNotFoundException ($"Gradle tool was not found at {GradlePath}.");
 			}
 
 			if (string.IsNullOrEmpty (ProcessLogFile)) {