diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
index 760479ee6f5..accb0405ad9 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -232,7 +232,7 @@ public static partial class Defaults
 		public static partial class Paths
 		{
 			// Global, compile-time locations
-			public static readonly string HomeDir                          = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+			public static readonly string HomeDir                          = Environment.GetFolderPath (Environment.SpecialFolder.UserProfile);
 			public static readonly string BootstrapResourcesDir            = Path.Combine (BuildPaths.XAPrepareSourceDir, "Resources");
 			public static readonly string BuildToolsDir                    = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools");
 			public static readonly string BuildToolsScriptsDir             = Path.Combine (BuildToolsDir, "scripts");
diff --git a/src-ThirdParty/NUnitLite/Env.cs b/src-ThirdParty/NUnitLite/Env.cs
index 0d9a547f5d8..5bac1bdfca7 100644
--- a/src-ThirdParty/NUnitLite/Env.cs
+++ b/src-ThirdParty/NUnitLite/Env.cs
@@ -50,7 +50,7 @@ public class Env
 #if SILVERLIGHT || PocketPC || WindowsCE || NETCF
         public static string DocumentFolder = @"\My Documents";
 #else
-        public static string DocumentFolder = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+        public static string DocumentFolder = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
 #endif
     }
 }
diff --git a/tests/MSBuildDeviceIntegration/Resources/LinkDescTest/Bug35195.cs b/tests/MSBuildDeviceIntegration/Resources/LinkDescTest/Bug35195.cs
index 874fc525038..8f2f29f91ce 100644
--- a/tests/MSBuildDeviceIntegration/Resources/LinkDescTest/Bug35195.cs
+++ b/tests/MSBuildDeviceIntegration/Resources/LinkDescTest/Bug35195.cs
@@ -12,7 +12,7 @@ public static string AttemptCreateTable ()
 			try {
 				// Initialize the database name.
 				const string sqliteFilename = "TaskDB.db3";
-				string libraryPath = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+				string libraryPath = Environment.GetFolderPath (Environment.SpecialFolder.UserProfile);
 				string path = Path.Combine (libraryPath, sqliteFilename);
 				var db = new SQLiteAsyncConnection (path);
 				db.CreateTableAsync<TodoTask> ().GetAwaiter ().GetResult ();
diff --git a/tests/Mono.Android-Tests/Mono.Data.Sqlite/SqliteTests.cs b/tests/Mono.Android-Tests/Mono.Data.Sqlite/SqliteTests.cs
index 321df6122cb..3b4e65bd53a 100644
--- a/tests/Mono.Android-Tests/Mono.Data.Sqlite/SqliteTests.cs
+++ b/tests/Mono.Android-Tests/Mono.Data.Sqlite/SqliteTests.cs
@@ -41,7 +41,7 @@ static ItemsDb ()
 
 			ItemsDb ()
 			{
-				dbPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), fileName);
+				dbPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), fileName);
 			}
 
 			SqliteConnection GetConnection ()