diff --git a/Duplicati/UnitTest/CommandLineOperationsTests.cs b/Duplicati/UnitTest/CommandLineOperationsTests.cs
index 0d02774b2..95960bb33 100644
--- a/Duplicati/UnitTest/CommandLineOperationsTests.cs
+++ b/Duplicati/UnitTest/CommandLineOperationsTests.cs
@@ -36,6 +36,7 @@ namespace Duplicati.UnitTest
         protected readonly string SOURCEFOLDER = Path.Combine(BASEFOLDER, "data");
 
         private readonly string zipFilename = "data.zip";
+        private string zipFilepath => Path.Combine(BASEFOLDER, this.zipFilename);
 
         protected virtual IEnumerable<string> SourceDataFolders
         {
@@ -52,13 +53,12 @@ namespace Duplicati.UnitTest
         {
             base.OneTimeSetUp();
             
-            string tempZipFile = Path.Combine(BASEFOLDER, this.zipFilename);
             using (WebClient client = new WebClient())
             {
-                client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", tempZipFile);
+                client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", this.zipFilepath);
             }
             
-            System.IO.Compression.ZipFile.ExtractToDirectory(tempZipFile, BASEFOLDER);
+            System.IO.Compression.ZipFile.ExtractToDirectory(this.zipFilepath, BASEFOLDER);
         }
 
         public override void OneTimeTearDown()
@@ -67,11 +67,9 @@ namespace Duplicati.UnitTest
             {
                 Directory.Delete(this.SOURCEFOLDER, true);
             }
-            
-            string zipFile = Path.Combine(BASEFOLDER, this.zipFilename);
-            if (File.Exists(zipFile))
+            if (File.Exists(this.zipFilepath))
             {
-                File.Delete(zipFile);
+                File.Delete(this.zipFilepath);
             }
         }
 
diff --git a/Duplicati/UnitTest/GeneralBlackBoxTesting.cs b/Duplicati/UnitTest/GeneralBlackBoxTesting.cs
index 576c0b796..9775c1b68 100644
--- a/Duplicati/UnitTest/GeneralBlackBoxTesting.cs
+++ b/Duplicati/UnitTest/GeneralBlackBoxTesting.cs
@@ -29,6 +29,7 @@ namespace Duplicati.UnitTest
     {
         private static readonly string SOURCE_FOLDERS = Path.Combine(BASEFOLDER, "DSMCBE");
         private readonly string zipFilename = "DSMCBE.zip";
+        private string zipFilepath => Path.Combine(BASEFOLDER, this.zipFilename);
 
         protected IEnumerable<string> TestFolders
         {
@@ -65,13 +66,12 @@ namespace Duplicati.UnitTest
         {
             base.OneTimeSetUp();
             
-            string tempZipFile = Path.Combine(BASEFOLDER, this.zipFilename);
             using (WebClient client = new WebClient())
             {
-                client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", tempZipFile);
+                client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", this.zipFilepath);
             }
             
-            System.IO.Compression.ZipFile.ExtractToDirectory(tempZipFile, BASEFOLDER);
+            System.IO.Compression.ZipFile.ExtractToDirectory(this.zipFilepath, BASEFOLDER);
         }
 
         public override void OneTimeTearDown()
@@ -80,11 +80,9 @@ namespace Duplicati.UnitTest
             {
                 Directory.Delete(SOURCE_FOLDERS, true);
             }
-
-            string zipFile = Path.Combine(BASEFOLDER, this.zipFilename);
-            if (File.Exists(zipFile))
+            if (File.Exists(this.zipFilepath))
             {
-                File.Delete(zipFile);
+                File.Delete(this.zipFilepath);
             }
         }