Fix leaktests to use new way of toggling on legacy editor support

2 files changed, 10 insertions, 8 deletions

diff --git a/main/tests/StressTest/UserInterfaceTests/Properties.cs b/main/tests/StressTest/UserInterfaceTests/Properties.cs
index 62eea0c8c2..1a8e7fb1db 100644
--- a/main/tests/StressTest/UserInterfaceTests/Properties.cs
+++ b/main/tests/StressTest/UserInterfaceTests/Properties.cs
@@ -5,11 +5,6 @@ namespace MonoDevelop.StressTest
 {
 	public static class Properties
 	{
-		const string useNewEditorProperty = "MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableNewEditor";
-
-		public static bool UseNewEditor {
-			get => TestService.Session.GetGlobalValue<bool> (useNewEditorProperty);
-			set => TestService.Session.SetGlobalValue (useNewEditorProperty, value);
-		}
+		public static bool UseNewEditor { get; set; } = true;
 	}
 }
diff --git a/main/tests/UserInterfaceTests/TestService.cs b/main/tests/UserInterfaceTests/TestService.cs
index 863100afd0..c9c1fe9090 100644
--- a/main/tests/UserInterfaceTests/TestService.cs
+++ b/main/tests/UserInterfaceTests/TestService.cs
@@ -27,6 +27,7 @@
 using System;
 using MonoDevelop.Components.AutoTest;
 using System.Collections.Generic;
+using MonoDevelop.StressTest;
 
 namespace UserInterfaceTests
 {
@@ -39,12 +40,18 @@ namespace UserInterfaceTests
 			Session = new AutoTestClientSession ();
 
 			profilePath = profilePath ?? Util.CreateTmpDir ("profile");
-			Session.StartApplication (file: file, args: args, environment: new Dictionary<string, string> {
+
+			var env = new Dictionary<string, string> {
 				{ "MONODEVELOP_PROFILE", profilePath },
 				{ "VISUALSTUDIO_PROFILE", profilePath },
 				{ "MONODEVELOP_LOG_FILE", logFile },
 				{ "MONODEVELOP_FILE_LOG_LEVEL", "UpToInfo" },
-			});
+			};
+
+			if (!Properties.UseNewEditor)
+				env.Add ("MD_FEATURES_ENABLED", "AlwaysUseLegacyEditor");
+
+			Session.StartApplication (file: file, args: args, environment: env);
 
 			Session.SetGlobalValue ("MonoDevelop.Core.Instrumentation.InstrumentationService.Enabled", true);
 			Session.GlobalInvoke ("MonoDevelop.Ide.IdeApp.Workbench.GrabDesktopFocus");