diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 3b10bdaa..3bd384ba 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -101,7 +101,7 @@ jobs:
     - uses: actions/checkout@v4
       with: { fetch-depth: 2 }
     - run: brew install jq mbedtls openssl
-    - run: make -C test test ASAN_OPTIONS= MBEDTLS=`echo /usr/local/Cellar/mbedtls*/*` OPENSSL=`echo /usr/local/Cellar/openssl*/*`
+    - run: make -C test test ASAN_OPTIONS= MBEDTLS=$(echo $(brew --cellar)/mbedtls*/*) OPENSSL=$(echo $(brew --cellar)/openssl*/*)
   windows:
     runs-on: ubuntu-latest
     strategy:
diff --git a/test/Makefile b/test/Makefile
index 46722004..537fd048 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -183,7 +183,7 @@ mongoose.h: $(HDRS) Makefile
 
 
 clean: clean_examples clean_refprojs clean_tutorials clean_examples_embedded
-	rm -rf $(PROG) *.exe *.o *.dSYM *_test* ut fuzzer *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb slow-unit* _CL_* infer-out data.txt crash-* packed_fs.c pack
+	rm -rf $(PROG) *.exe *.o *.dSYM *_test ut fuzzer *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb slow-unit* _CL_* infer-out data.txt crash-* packed_fs.c pack
 	#find examples -maxdepth 3 -name zephyr -prune -o -name Makefile -print | xargs dirname | xargs -n1 make clean -C
 
 
diff --git a/test/certs/ca.crt b/test/certs/ca.crt
index e3e58f31..f9529ab2 100644
--- a/test/certs/ca.crt
+++ b/test/certs/ca.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIBFTCBvAIJAJiASLWtAz5MMAoGCCqGSM49BAMCMBMxETAPBgNVBAMMCE1vbmdv
-b3NlMB4XDTI0MDMyNTExNTU0NVoXDTM0MDMyMzExNTU0NVowEzERMA8GA1UEAwwI
-TW9uZ29vc2UwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARaohnchUT4QTRIYKBX
-1k0n3/PDwpXwiPyJIb+Wwfsmx0Y74KU7xGZLHK2C1PmIADVnTf3z304E97AXM+WV
-3gkOMAoGCCqGSM49BAMCA0gAMEUCIQDJ0GYwCwucIKl+K/zRgptW6HVxD5y6+hu4
-YBP9j+vwCAIgWJswYluq0szGxmfKnSXyTDioA1XrDhCVjYGO61U60Gk=
+MIIBFTCBvAIJAMNTFtpfcq8NMAoGCCqGSM49BAMCMBMxETAPBgNVBAMMCE1vbmdv
+b3NlMB4XDTI0MDUwNzE0MzczNloXDTM0MDUwNTE0MzczNlowEzERMA8GA1UEAwwI
+TW9uZ29vc2UwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASuP+86T/rOWnGpEVhl
+fxYZ+pjMbCmDZ+vdnP0rjoxudwRMRQCv5slRlDK7Lxue761sdvqxWr0Ma6TFGTNg
+epsRMAoGCCqGSM49BAMCA0gAMEUCIQCwb2CxuAKm51s81S6BIoy1IcandXSohnqs
+us64BAA7QgIgGGtUrpkgFSS0oPBlCUG6YPHFVw42vTfpTC0ySwAS0M4=
 -----END CERTIFICATE-----
diff --git a/test/certs/ca.key b/test/certs/ca.key
index bec99e5f..ee082d52 100644
--- a/test/certs/ca.key
+++ b/test/certs/ca.key
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHtFV1AGKDqJRVBg3hQEmkHQDlXxCDFpIJ4b7UUyUtHRoAoGCCqGSM49
-AwEHoUQDQgAEWqIZ3IVE+EE0SGCgV9ZNJ9/zw8KV8Ij8iSG/lsH7JsdGO+ClO8Rm
-SxytgtT5iAA1Z039899OBPewFzPlld4JDg==
+MHcCAQEEIJqrhcIKC5dk0omuRJRnzCXdfxevxnabQEnOWlL6P6x1oAoGCCqGSM49
+AwEHoUQDQgAErj/vOk/6zlpxqRFYZX8WGfqYzGwpg2fr3Zz9K46MbncETEUAr+bJ
+UZQyuy8bnu+tbHb6sVq9DGukxRkzYHqbEQ==
 -----END EC PRIVATE KEY-----
diff --git a/test/certs/ca.srl b/test/certs/ca.srl
index 09f8401a..c5ae587f 100644
--- a/test/certs/ca.srl
+++ b/test/certs/ca.srl
@@ -1 +1 @@
-96EAA481EB95FF30
+96EAA481EB95FF36
diff --git a/test/certs/client.crt b/test/certs/client.crt
index ef574fcd..5954ce7d 100644
--- a/test/certs/client.crt
+++ b/test/certs/client.crt
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIBLTCB1KADAgECAgkAluqkgeuV/zAwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwI
-TW9uZ29vc2UwHhcNMjQwMzI1MTE1NTQ1WhcNMjQwNDI0MTE1NTQ1WjAMMQowCAYD
-VQQDDAFjMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoyB/9kTJJnPLlLFrQmME
-6LMvCpjp05MuSTOvEmXqfWH+eC2e0bb6h7YIW+lcOrVQhDEt6xKFs1rqKUR0lgou
-/6MYMBYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MAoGCCqGSM49BAMCA0gAMEUCIQDy
-11QWTyWuTq6avrsVi4lWfjMQSm14RxtyYUiStaahnwIgcXrf5MeOlupWLxPqEZTz
-uOejUi45wZ6m3S1BLa31g3Y=
+MIIBMjCB2aADAgECAgkAluqkgeuV/zYwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwI
+TW9uZ29vc2UwHhcNMjQwNTA3MTQzNzM2WhcNMzQwNTA1MTQzNzM2WjARMQ8wDQYD
+VQQDDAZjbGllbnQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASXNWpzrToZJQVB
+dIJCeIw4j43kV38oehDKhYnaPJDTkqoKrEtSTvXWFY7BxnjUhSkSWBElcq/g6qiP
+TquJCvXLoxgwFjAUBgNVHREEDTALgglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDSAAw
+RQIhAOsbCgeobKm0sOmQKzH9+KYmoxL/8AXMAzWozd2bEtivAiACyLVppRHjgA/e
+rP1mRkL0RAUxPw6s/gK7TFcPXUqzGQ==
 -----END CERTIFICATE-----
diff --git a/test/certs/client.csr b/test/certs/client.csr
index c817e2be..e34b977a 100644
--- a/test/certs/client.csr
+++ b/test/certs/client.csr
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIHGMG4CAQAwDDEKMAgGA1UEAwwBYzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
-BKMgf/ZEySZzy5Sxa0JjBOizLwqY6dOTLkkzrxJl6n1h/ngtntG2+oe2CFvpXDq1
-UIQxLesShbNa6ilEdJYKLv+gADAKBggqhkjOPQQDAgNIADBFAiBDSG3wDIJaEn5c
-PU+4WLGJ8+nzTewHGtpQELOXWURxLQIhAP5BocCQyrGW/5dEc/VWMgqH2eznZJcT
-ftb9Tk6I6Pjx
+MIHKMHMCAQAwETEPMA0GA1UEAwwGY2xpZW50MFkwEwYHKoZIzj0CAQYIKoZIzj0D
+AQcDQgAElzVqc606GSUFQXSCQniMOI+N5Fd/KHoQyoWJ2jyQ05KqCqxLUk711hWO
+wcZ41IUpElgRJXKv4Oqoj06riQr1y6AAMAoGCCqGSM49BAMCA0cAMEQCIH0SLqrh
+1ieUh01dSUMJLVRDkrSsZu+Z/ZiYPaHNd1I0AiBKNu9sLEc4vtxwZJJvdwer3pbq
+Uw7jMwjwyuhZd2+eJA==
 -----END CERTIFICATE REQUEST-----
diff --git a/test/certs/client.key b/test/certs/client.key
index 8bd8aaa9..2b181f0d 100644
--- a/test/certs/client.key
+++ b/test/certs/client.key
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPEthf+Qq9dXJBxSZuYr2WhgzuhrDfMaD1kQzeKHZFfDoAoGCCqGSM49
-AwEHoUQDQgAEoyB/9kTJJnPLlLFrQmME6LMvCpjp05MuSTOvEmXqfWH+eC2e0bb6
-h7YIW+lcOrVQhDEt6xKFs1rqKUR0lgou/w==
+MHcCAQEEIGzf9AgYx3RfhzMGwv5EWgzoQh/EDfFpieFgfpTisWbAoAoGCCqGSM49
+AwEHoUQDQgAElzVqc606GSUFQXSCQniMOI+N5Fd/KHoQyoWJ2jyQ05KqCqxLUk71
+1hWOwcZ41IUpElgRJXKv4Oqoj06riQr1yw==
 -----END EC PRIVATE KEY-----
diff --git a/test/certs/generate.sh b/test/certs/generate.sh
index 74cedb41..dae75bf3 100644
--- a/test/certs/generate.sh
+++ b/test/certs/generate.sh
@@ -18,15 +18,15 @@ openssl req -x509 -new -key ca.key -days 3650 -subj /CN=Mongoose -out ca.crt
 
 # Generate server cert
 openssl ecparam -noout -name prime256v1 -genkey -out server.key
-openssl req -new -sha256 -key server.key -days 3650 -subj /CN=s -out server.csr
+openssl req -new -sha256 -key server.key -days 3650 -subj /CN=server -out server.csr
 openssl x509 -req -sha256 -in server.csr -extensions SAN -extfile cnf \
-  -CAkey ca.key -CA ca.crt -CAcreateserial -out server.crt
+  -CAkey ca.key -CA ca.crt -CAcreateserial -days 3650 -out server.crt
 
 # Generate client cert
 openssl ecparam -noout -name prime256v1 -genkey -out client.key
-openssl req -new -sha256 -key client.key -days 3650 -subj /CN=c -out client.csr
+openssl req -new -sha256 -key client.key -days 3650 -subj /CN=client -out client.csr
 openssl x509 -req -sha256 -in client.csr -extensions SAN -extfile cnf \
-  -CAkey ca.key -CA ca.crt -CAcreateserial -out client.crt
+  -CAkey ca.key -CA ca.crt -CAcreateserial -days 3650 -out client.crt
 
 # Verify
 openssl verify -verbose -CAfile ca.crt server.crt
diff --git a/test/certs/server.crt b/test/certs/server.crt
index 2fd806c7..d4518e8c 100644
--- a/test/certs/server.crt
+++ b/test/certs/server.crt
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIBLTCB1KADAgECAgkAluqkgeuV/y8wCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwI
-TW9uZ29vc2UwHhcNMjQwMzI1MTE1NTQ1WhcNMjQwNDI0MTE1NTQ1WjAMMQowCAYD
-VQQDDAFzMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEMExDcDCj1g8MeQrY+Ccy
-voozGUcp7pi9M09q5GKYJ++WOEuEHDqnu4vEr/PQdgGhmeA5JmWEsztz1f0XgNuK
-MaMYMBYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MAoGCCqGSM49BAMCA0gAMEUCIQCn
-K8fWr7ULIpU3Dq5IDm6NpNLd/fv4A5it0H0Un9noEAIgPdeWcFVsL7YrGfs0QkWV
-y4ES/uFAj0jdQy8Vm+jzfD8=
+MIIBMTCB2aADAgECAgkAluqkgeuV/zUwCgYIKoZIzj0EAwIwEzERMA8GA1UEAwwI
+TW9uZ29vc2UwHhcNMjQwNTA3MTQzNzM2WhcNMzQwNTA1MTQzNzM2WjARMQ8wDQYD
+VQQDDAZzZXJ2ZXIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASo3oEiG+BuTt5y
+ZRyfwNr0C+SP+4M0RG2pYkb2v+ivbpfi72NHkmXiF/kbHXtgmSrn/PeTqiA8M+mg
+BhYjDX+zoxgwFjAUBgNVHREEDTALgglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDRwAw
+RAIgTXW9MITQSwzqbNTxUUdt9DcB+8pPUTbWZpiXcA26GMYCIBiYw+DSFMLHmkHF
++5U3NXW3gVCLN9ntD5DAx8LTG8sB
 -----END CERTIFICATE-----
diff --git a/test/certs/server.csr b/test/certs/server.csr
index 25235dd9..82467665 100644
--- a/test/certs/server.csr
+++ b/test/certs/server.csr
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIHFMG4CAQAwDDEKMAgGA1UEAwwBczBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
-BDBMQ3Awo9YPDHkK2PgnMr6KMxlHKe6YvTNPauRimCfvljhLhBw6p7uLxK/z0HYB
-oZngOSZlhLM7c9X9F4DbijGgADAKBggqhkjOPQQDAgNHADBEAiB4+PwVzRQn4dSE
-I958FyxOJjKlKQ9DjBZCOStqrp2IugIgbAJG26EqDew7MvZWLtCR6ug6qBU2/hjG
-0QDyaZrCHeQ=
+MIHMMHMCAQAwETEPMA0GA1UEAwwGc2VydmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0D
+AQcDQgAEqN6BIhvgbk7ecmUcn8Da9Avkj/uDNERtqWJG9r/or26X4u9jR5Jl4hf5
+Gx17YJkq5/z3k6ogPDPpoAYWIw1/s6AAMAoGCCqGSM49BAMCA0kAMEYCIQCOydOU
++7sELXySq1CB66e2fVTpRUO/vET0SjcRc6jLigIhAMPTkWiALWIOvyVHA3dMQctr
+72yTgPuMgEHTe7keZ32E
 -----END CERTIFICATE REQUEST-----
diff --git a/test/certs/server.key b/test/certs/server.key
index 0d7964fc..b146ec2f 100644
--- a/test/certs/server.key
+++ b/test/certs/server.key
@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFw94mvaH1YQyHWQRMNLU62csD8nu9GHJH5mKkiuJpPDoAoGCCqGSM49
-AwEHoUQDQgAEMExDcDCj1g8MeQrY+CcyvoozGUcp7pi9M09q5GKYJ++WOEuEHDqn
-u4vEr/PQdgGhmeA5JmWEsztz1f0XgNuKMQ==
+MHcCAQEEIAVdo8UAScxG7jiuNY2UZESNX/KPH8qJ0u0gOMMsAzYWoAoGCCqGSM49
+AwEHoUQDQgAEqN6BIhvgbk7ecmUcn8Da9Avkj/uDNERtqWJG9r/or26X4u9jR5Jl
+4hf5Gx17YJkq5/z3k6ogPDPpoAYWIw1/sw==
 -----END EC PRIVATE KEY-----