diff --git a/CHANGELOG.md b/CHANGELOG.md
index a64cb9b49..9e8712920 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - #1690: Replaced GeckoFX (Firefox) with CefSharp (Chromium)
 - #1325: Language resource files cleanup
 ### Fixed
+- #2098: Fix failed BinaryFileTest
 - #2097: Fix failed tests related to mRemoteNGTests.UI.Window.ConfigWindowTests
 - #2096: Corrected encryption code of LegacyRijndaelCryptographyProvider
 - #2089: Fixed the exception thrown by menu buttons "Documentation" and "Website"
diff --git a/mRemoteNGTests/BinaryFileTests.cs b/mRemoteNGTests/BinaryFileTests.cs
index c64efb049..1ba2bbe16 100644
--- a/mRemoteNGTests/BinaryFileTests.cs
+++ b/mRemoteNGTests/BinaryFileTests.cs
@@ -17,14 +17,14 @@ namespace mRemoteNGTests
         public string GetTargetPath([CallerFilePath] string sourceFilePath = "")
         {
             const string debugOrRelease =
-            #if DEBUG
+            #if DEBUG || DEBUG_PORTABLE
 				"Debug";
             #else
 				"Release";
             #endif
 
             const string normalOrPortable =
-            #if PORTABLE
+            #if PORTABLE || DEBUG_PORTABLE
                 " Portable";
             #else
             "";