diff --git a/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/BaseCustomRuntimeTest.cs b/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/BaseCustomRuntimeTest.cs
index a0a67f242..5b2741b5f 100644
--- a/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/BaseCustomRuntimeTest.cs
+++ b/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/BaseCustomRuntimeTest.cs
@@ -189,6 +189,8 @@ private async Task DeleteDeploymentZipAndBucketAsync(IAmazonS3 s3Client, string
 
         protected async Task<InvokeResponse> InvokeFunctionAsync(IAmazonLambda lambdaClient, string payload)
         {
+            await WaitForFunctionToBeReady(lambdaClient);
+
             var request = new InvokeRequest
             {
                 FunctionName = FunctionName,
diff --git a/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.UnitTests/NativeAOTTests.cs b/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.UnitTests/NativeAOTTests.cs
index ae7f7aaf7..5b1738642 100644
--- a/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.UnitTests/NativeAOTTests.cs
+++ b/Libraries/test/Amazon.Lambda.RuntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.UnitTests/NativeAOTTests.cs
@@ -19,7 +19,9 @@ public NativeAOTTests(ITestOutputHelper output)
             _output = output;
         }
 
+#if DEBUG // Only running this test right now in local environment because CI system doesn't have Native AOT prereqs installed.
         [Fact]
+#endif
         public void EnsureNoTrimWarningsDuringPublish()
         {
             var projectDirectory = FindProject("NativeAOTFunction");