diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/ArchiveTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/ArchiveTaskBase.cs
index e259cd33b350..3b18165c4d9e 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/ArchiveTaskBase.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/ArchiveTaskBase.cs
@@ -64,7 +64,7 @@ protected string MSYMDir {
 
 		protected string XcodeArchivesDir {
 			get {
-				var home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+				var home = Environment.GetFolderPath (Environment.SpecialFolder.UserProfile);
 
 				return Path.Combine (home, "Library", "Developer", "Xcode", "Archives");
 			}
diff --git a/tests/monotouch-test/Foundation/FileManagerTest.cs b/tests/monotouch-test/Foundation/FileManagerTest.cs
index a0aa761e6d60..c8d2ec69a99c 100644
--- a/tests/monotouch-test/Foundation/FileManagerTest.cs
+++ b/tests/monotouch-test/Foundation/FileManagerTest.cs
@@ -95,7 +95,7 @@ public void GetSkipBackupAttribute ()
 		{
 			Assert.False (NSFileManager.GetSkipBackupAttribute (NSBundle.MainBundle.ExecutableUrl.ToString ()), "MainBundle");
 
-			string filename = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), $"DoNotBackupMe-NSFileManager-{Process.GetCurrentProcess ().Id}");
+			string filename = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), $"DoNotBackupMe-NSFileManager-{Process.GetCurrentProcess ().Id}");
 			try {
 				File.WriteAllText (filename, "not worth a bit");
 				
diff --git a/tests/monotouch-test/Foundation/UrlTest.cs b/tests/monotouch-test/Foundation/UrlTest.cs
index ef4609c8f213..e671312b7340 100644
--- a/tests/monotouch-test/Foundation/UrlTest.cs
+++ b/tests/monotouch-test/Foundation/UrlTest.cs
@@ -49,7 +49,7 @@ public void IsExcludedFromBackupKey ()
 			Assert.That (value, Is.TypeOf (typeof (NSNumber)), "NSNumber");
 			Assert.That ((int) (value as NSNumber), Is.EqualTo (0), "0");
 			
-			string filename = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), $"DoNotBackupMe-NSUrl-{Process.GetCurrentProcess ().Id}");
+			string filename = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), $"DoNotBackupMe-NSUrl-{Process.GetCurrentProcess ().Id}");
 			try {
 				File.WriteAllText (filename, "not worth a bit");
 				using (NSUrl url = NSUrl.FromFilename (filename)) {
diff --git a/tools/common/Driver.cs b/tools/common/Driver.cs
index ad8a4a8fe3c6..fce20b23075e 100644
--- a/tools/common/Driver.cs
+++ b/tools/common/Driver.cs
@@ -321,7 +321,7 @@ static Driver ()
 		static int GetDefaultVerbosity ()
 		{
 			var v = 0;
-			var fn = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), $".{NAME}-verbosity");
+			var fn = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), $".{NAME}-verbosity");
 			if (File.Exists (fn)) {
 				v = (int) new FileInfo (fn).Length;
 				if (v == 0)
diff --git a/tools/devops/mac-tests-provisioning.csx.in b/tools/devops/mac-tests-provisioning.csx.in
index a2b7497eed12..add2695b54d5 100644
--- a/tools/devops/mac-tests-provisioning.csx.in
+++ b/tools/devops/mac-tests-provisioning.csx.in
@@ -16,7 +16,7 @@ if (!string.IsNullOrEmpty ("@INCLUDE_XAMARIN_LEGACY@")) {
 
 BrewPackages ("p7zip");
 
-var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
+var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), "Library", "Preferences", "Xamarin", "Settings.plist");
 Item ("Override Apple SDK Settings")
 	.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
 	.Action (item => {