diff --git a/src/cloud-api-adaptor/test/e2e/aws_test.go b/src/cloud-api-adaptor/test/e2e/aws_test.go
index 864d734e3..4189120b3 100644
--- a/src/cloud-api-adaptor/test/e2e/aws_test.go
+++ b/src/cloud-api-adaptor/test/e2e/aws_test.go
@@ -6,6 +6,7 @@
 package e2e
 
 import (
+	"fmt"
 	"testing"
 
 	_ "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/test/provisioner/aws"
@@ -17,7 +18,6 @@ func TestAwsCreateSimplePod(t *testing.T) {
 }
 
 func TestAwsCreatePodWithConfigMap(t *testing.T) {
-	t.Skip("Test not passing")
 	assert := NewAWSAssert()
 
 	DoTestCreatePodWithConfigMap(t, testEnv, assert)
@@ -101,6 +101,7 @@ func TestAwsDeletePod(t *testing.T) {
 }
 
 func TestAwsCreateNginxDeployment(t *testing.T) {
+	t.Skip("Test not passing")
 	assert := NewAWSAssert()
 	DoTestNginxDeployment(t, testEnv, assert)
 }
@@ -108,6 +109,11 @@ func TestAwsCreateNginxDeployment(t *testing.T) {
 func TestAwsCreatePeerPodContainerWithInvalidAlternateImage(t *testing.T) {
 	assert := NewAWSAssert()
 	nonExistingImageName := "ami-123456"
-	expectedErrorMessage := "InvalidAMIID.NotFound: The image id '[ami-1234567]' does not exist: not found"
+	expectedErrorMessage := fmt.Sprintf("InvalidAMIID.NotFound: The image id '[%s]' does not exist: not found", nonExistingImageName)
 	DoTestCreatePeerPodContainerWithInvalidAlternateImage(t, testEnv, assert, nonExistingImageName, expectedErrorMessage)
 }
+
+func TestAwsPodWithInitContainer(t *testing.T) {
+	assert := NewAWSAssert()
+	DoTestPodWithInitContainer(t, testEnv, assert)
+}
diff --git a/src/cloud-api-adaptor/test/provisioner/aws/provision_common.go b/src/cloud-api-adaptor/test/provisioner/aws/provision_common.go
index c822c6582..15c1ec6e9 100644
--- a/src/cloud-api-adaptor/test/provisioner/aws/provision_common.go
+++ b/src/cloud-api-adaptor/test/provisioner/aws/provision_common.go
@@ -746,8 +746,19 @@ func (v *Vpc) deleteVpc() error {
 
 // createBucket Creates the S3 bucket
 func (b *S3Bucket) createBucket() error {
-	// No harm creating a bucket that already exist.
-	_, err := b.Client.CreateBucket(context.TODO(), &s3.CreateBucketInput{
+	buckets, err := b.Client.ListBuckets(context.TODO(), &s3.ListBucketsInput{})
+	if err != nil {
+		return err
+	}
+
+	for _, bucket := range buckets.Buckets {
+		if *bucket.Name == b.Name {
+			// Bucket exists
+			return nil
+		}
+	}
+
+	_, err = b.Client.CreateBucket(context.TODO(), &s3.CreateBucketInput{
 		Bucket: &b.Name,
 	})
 	if err != nil {