diff --git a/tests/canary/canary.buildspec.yaml b/tests/canary/canary.buildspec.yaml
index ebbb1a047..fd119f8fc 100644
--- a/tests/canary/canary.buildspec.yaml
+++ b/tests/canary/canary.buildspec.yaml
@@ -6,6 +6,7 @@ phases:
       # Get cached test image
       - aws ecr get-login-password --region $CLUSTER_REGION | docker login --username AWS --password-stdin $ECR_CACHE_URI || true
       - docker pull ${ECR_CACHE_URI}:latest --quiet || true
+
       # Build test image
       - >
         docker build -f ./tests/canary/Dockerfile.canary . -t ${ECR_CACHE_URI}:latest --quiet
@@ -14,15 +15,8 @@ phases:
     commands:
       # Run tests
       - docker run --name kf-distro-canary $(env | cut -f1 -d= | sed 's/^/-e /') --mount type=bind,source="$(pwd)/",target="/kubeflow-manifests/" ${ECR_CACHE_URI}:latest
-  post_build:
-    commands:
-      - docker cp kf-distro-canary:/kubeflow-manifests/tests/canary/integration_tests.xml /tmp/results.xml || true
-        # Push test image to cache ECR repo
+      
+      # Push test image to cache ECR repo
       - docker push ${ECR_CACHE_URI}:latest || true
-
-reports:
-  IntegrationTestReport:
-    files:
-      - "results.xml"
-    base-directory: "/tmp"    
+      
       
diff --git a/tests/canary/scripts/push_stats_to_cloudwatch.py b/tests/canary/scripts/push_stats_to_cloudwatch.py
index a065dcf74..3d102db12 100644
--- a/tests/canary/scripts/push_stats_to_cloudwatch.py
+++ b/tests/canary/scripts/push_stats_to_cloudwatch.py
@@ -60,7 +60,6 @@ def readXML_and_publish_metrics_to_cw():
             "Value": int(successes),
             "Unit": "Count",
         },
-<<<<<<< HEAD
         {
             "MetricName": "success_rate",
             "Timestamp": timestamp,
@@ -70,8 +69,6 @@ def readXML_and_publish_metrics_to_cw():
             "Value": int(success_rate),
             "Unit": "Percent",
         },
-=======
->>>>>>> 632ec70b ([Cherry Pick] Enable canary report generation (#634))
     ]
 
     # Use the put_metric_data method to push the metric data to CloudWatch
@@ -101,8 +98,4 @@ def main():
 
 
 if __name__ == "__main__":
-<<<<<<< HEAD
     main()
-=======
-    main()
->>>>>>> 632ec70b ([Cherry Pick] Enable canary report generation (#634))
diff --git a/tests/canary/scripts/run_test.sh b/tests/canary/scripts/run_test.sh
index b21daa43c..574d6774f 100755
--- a/tests/canary/scripts/run_test.sh
+++ b/tests/canary/scripts/run_test.sh
@@ -9,11 +9,10 @@
 # Script configuration
 set -euo pipefail
 
-function push_to_cloudwatch {
-  echo "Pushing Codebuild stats to Cloudwatch."
-  python ../canary/scripts/push_stats_to_cloudwatch.py
+function onError {
+  echo "Run test FAILED. Exiting."
 }
-trap push_to_cloudwatch EXIT
+trap onError ERR
 
 export CANARY_TEST_DIR=${REPO_PATH}/tests/canary
 export E2E_TEST_DIR=${REPO_PATH}/tests/e2e
@@ -32,5 +31,6 @@ mkdir -p $E2E_TEST_DIR/.metadata/
 cp metadata-canary $E2E_TEST_DIR/.metadata/
 
 cd $E2E_TEST_DIR
-pytest tests/test_sanity_portforward.py -s -q --metadata .metadata/metadata-canary --region $CLUSTER_REGION --installation_option $INSTALLATION_OPTION --junitxml ../canary/integration_tests.xml
+pytest tests/test_sanity_portforward.py -s -q --metadata .metadata/metadata-canary --region $CLUSTER_REGION --installation_option $INSTALLATION_OPTION
+