diff --git a/tests/ci/integration/run_tpm2_tss_integration.sh b/tests/ci/integration/run_tpm2_tss_integration.sh
index ba2ea950d2f..23dcd720de1 100755
--- a/tests/ci/integration/run_tpm2_tss_integration.sh
+++ b/tests/ci/integration/run_tpm2_tss_integration.sh
@@ -47,7 +47,7 @@ function curl_build() {
 }
 
 function tpm2_tss_build() {
-  git apply "${SCRIPT_DIR}/tpm2_tss_patch/aws-lc-tpm2-tss.patch"
+  patch -p1 --quiet -i "${SCRIPT_DIR}/tpm2_tss_patch/aws-lc-tpm2-tss.patch"
   export PKG_CONFIG_PATH="${AWS_LC_INSTALL_FOLDER}/lib/pkgconfig:${CURL_INSTALL_FOLDER}/lib/pkgconfig"
   /bin/sh ./bootstrap
   ./configure --enable-unit --with-crypto=ossl --prefix="${TPM2_TSS_INSTALL_FOLDER}"
@@ -67,7 +67,7 @@ function tpm2_abrmd_build() {
 }
 
 function tpm2_tools_build() {
-  git apply "${SCRIPT_DIR}/tpm2_tools_patch/aws-lc-tpm2-tools.patch"
+  patch -p1 --quiet -i "${SCRIPT_DIR}/tpm2_tools_patch/aws-lc-tpm2-tools.patch"
   export PKG_CONFIG_PATH="${AWS_LC_INSTALL_FOLDER}/lib/pkgconfig:${TPM2_TSS_INSTALL_FOLDER}/lib/pkgconfig:${TPM2_ABRMD_INSTALL_FOLDER}/lib/pkgconfig"
   /bin/sh ./bootstrap
   ./configure --with-crypto=ossl
diff --git a/tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch b/tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch
index 541512cd7ff..dfb8f515c85 100644
--- a/tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch
+++ b/tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch
@@ -70,15 +70,6 @@ index 75e81141..79f77fdf 100644
      size_t ui;
      AUTHORITY_INFO_ACCESS *info = NULL;
      ASN1_IA5STRING *uri = NULL;
-@@ -463,7 +463,7 @@ ifapi_get_curl_buffer(unsigned char * url, unsigned char ** buffer,
-         goto out_easy_cleanup;
-     }
- 
--    rc = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
-+    rc = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-     if (rc != CURLE_OK) {
-         LOG_ERROR("curl_easy_setopt for CURLOPT_FOLLOWLOCATION failed: %s",
-                   curl_easy_strerror(rc));
 diff --git a/src/tss2-fapi/ifapi_verify_cert_chain.c b/src/tss2-fapi/ifapi_verify_cert_chain.c
 index b495e512..c741c8ad 100644
 --- a/src/tss2-fapi/ifapi_verify_cert_chain.c