diff --git a/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj b/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj
index 5b06ca87506641..73be2204a52e9c 100644
--- a/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj
+++ b/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PublishTrimmed>true</PublishTrimmed>
+    <PublishTrimmed Condition="'$(SelfContained)' != 'false'">true</PublishTrimmed>
     <PublishAot Condition="'$(UseNativeAotForComponents)' == 'true'">true</PublishAot>
-    <PublishSingleFile Condition="'$(UseNativeAotForComponents)' != 'true'">true</PublishSingleFile>
+    <PublishSingleFile Condition="'$(UseNativeAotForComponents)' != 'true' And '$(SelfContained)' != 'false'">true</PublishSingleFile>
     <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
 
diff --git a/src/tests/JIT/Directed/tailcall/mutual_recursion.fs b/src/tests/JIT/Directed/tailcall/mutual_recursion.fs
index ac6a167c1167a5..18dd2cdfeaa9d5 100644
--- a/src/tests/JIT/Directed/tailcall/mutual_recursion.fs
+++ b/src/tests/JIT/Directed/tailcall/mutual_recursion.fs
@@ -562,3 +562,9 @@ type Driver() =
 let main () =
     let driver = Driver()
     driver.Start()
+
+[<EntryPoint>]
+let entryPoint _argv =
+    let driver = Driver()
+    driver.Start()
+    100
diff --git a/src/tests/JIT/Methodical/int64/unsigned/implicit_promotion_il.ilproj b/src/tests/JIT/Methodical/int64/unsigned/implicit_promotion_il.ilproj
index 8a3f6ca933bfaf..e53b78dc2614ad 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/implicit_promotion_il.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/implicit_promotion_il.ilproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_87393/Runtime_87393.fs b/src/tests/JIT/Regression/JitBlue/Runtime_87393/Runtime_87393.fs
index 8f778af184b2b0..878422ac9ce33c 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_87393/Runtime_87393.fs
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_87393/Runtime_87393.fs
@@ -41,3 +41,13 @@ module Main =
         let v = f.M 0 65000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
         Assert.Equal(2112532500, v)
 
+    [<EntryPoint>]
+    let entryPoint _argv =
+        let f : Foo = Bar()
+        let v = f.M 0 65000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+        if v = 2112532500 then
+            printfn "PASS"
+            100
+        else
+            printfn "FAIL: Result was %A" v
+            -1
diff --git a/src/tests/async/capacity/capacity.csproj b/src/tests/async/capacity/capacity.csproj
index d74af313bba791..198d9ea843af16 100644
--- a/src/tests/async/capacity/capacity.csproj
+++ b/src/tests/async/capacity/capacity.csproj
@@ -7,5 +7,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
+    <ProjectReference Include="$(TestLibraryProjectPath)" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/tracing/userevents/common/userevents_common.csproj b/src/tests/tracing/userevents/common/userevents_common.csproj
index dff80ae7a50008..7bd07ede4fb1c6 100644
--- a/src/tests/tracing/userevents/common/userevents_common.csproj
+++ b/src/tests/tracing/userevents/common/userevents_common.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <IsTestProject>false</IsTestProject>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>