diff --git a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkHelper.cs b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkHelper.cs
index 8e65e0d82..507df55af 100644
--- a/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkHelper.cs
+++ b/src/Microsoft.DotNet.ScenarioTests.SdkTemplateTests/DotNetSdkHelper.cs
@@ -110,18 +110,19 @@ public void ExecutePublish(string projectDirectory, string? rid = null, bool? se
     {
         string options = string.Empty;
         string binlogDifferentiator = string.Empty;
+
+        if (!string.IsNullOrEmpty(rid))
+        {
+            options += $" -r {rid}";
+            binlogDifferentiator += $"-{rid}";
+        }
         
         if (selfContained.HasValue)
         {
-            options += $"--self-contained {selfContained.Value.ToString().ToLowerInvariant()}";
+            options += $" --self-contained {selfContained.Value.ToString().ToLowerInvariant()}";
             if (selfContained.Value)
             {
                 binlogDifferentiator += "self-contained";
-                if (!string.IsNullOrEmpty(rid))
-                {
-                    options += $" -r {rid}";
-                    binlogDifferentiator += $"-{rid}";
-                }
                 if (trimmed)
                 {
                     options += " /p:PublishTrimmed=true";