diff --git a/src/SayMore/MediaUtils/FFmpeg/FFmpegDownloadHelper.cs b/src/SayMore/MediaUtils/FFmpeg/FFmpegDownloadHelper.cs
index abd26bc61..9d64309ad 100644
--- a/src/SayMore/MediaUtils/FFmpeg/FFmpegDownloadHelper.cs
+++ b/src/SayMore/MediaUtils/FFmpeg/FFmpegDownloadHelper.cs
@@ -53,18 +53,7 @@ public static string FFmpegForSayMoreFolder
 		}
 
 		/// ------------------------------------------------------------------------------------
-		public static string FFmpegForSayMoreParentFolder
-		{
-			get
-			{
-#if DEBUG
-				//Program.CommonAppDataFolder; gives some resharper folder during tests
-				return Path.Combine(System.Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),"SIL/SayMore");
-#else
-				return Program.CommonAppDataFolder;
-#endif
-			}
-		}
+		public static string FFmpegForSayMoreParentFolder => Program.CommonAppDataFolder;
 
 		/// ------------------------------------------------------------------------------------
 		public static string FullPathToFFmpegForSayMoreExe
diff --git a/src/SayMore/Program.cs b/src/SayMore/Program.cs
index 754f7d8b0..3a74b6e5d 100644
--- a/src/SayMore/Program.cs
+++ b/src/SayMore/Program.cs
@@ -368,7 +368,7 @@ public static void ArchiveProjectUsingIMDI(Form parentForm)
 
 		public static List<XmlException> FileLoadErrors
 		{
-			get 
+			get
 			{
 				if (_projectContext == null || _projectContext.Project == null) // This can happen during unit testing
 					return new List<XmlException>(0);
@@ -422,7 +422,12 @@ public static string SilCommonDataFolder
 		/// ------------------------------------------------------------------------------------
 		public static string CommonAppDataFolder
 		{
+			//Application.ProductName gives some resharper folder during tests
+#if DEBUG
+			get { return Path.Combine(SilCommonDataFolder, "Saymore"); }
+#else
 			get { return Path.Combine(SilCommonDataFolder, Application.ProductName); }
+#endif
 		}
 
 		/// ------------------------------------------------------------------------------------