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 44286d8bd..c220a671e 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
@@ -81,6 +81,21 @@ protected async Task CleanUpTestResources(AmazonS3Client s3Client, AmazonLambdaC
             {
                 try
                 {
+                    var listAttachedPoliciesRequest = new ListAttachedRolePoliciesRequest
+                    {
+                        RoleName = ExecutionRoleName
+                    };
+                    var attachedPolicies = await iamClient.ListAttachedRolePoliciesAsync(listAttachedPoliciesRequest);
+
+                    foreach (var policy in attachedPolicies.AttachedPolicies)
+                    {
+                        await iamClient.DetachRolePolicyAsync(new DetachRolePolicyRequest
+                        {
+                            RoleName = ExecutionRoleName,
+                            PolicyArn = policy.PolicyArn
+                        });
+                    }
+
                     var deleteRoleRequest = new DeleteRoleRequest
                     {
                         RoleName = ExecutionRoleName