diff --git a/.github/workflows/build-and-run-examples.yml b/.github/workflows/build-and-run-examples.yml
index 2b59d66ae..04d5fa8e0 100644
--- a/.github/workflows/build-and-run-examples.yml
+++ b/.github/workflows/build-and-run-examples.yml
@@ -54,6 +54,12 @@ jobs:
         cd examples/posix/wh_posix_client
         ./Build/wh_posix_client.elf --type ${{ matrix.transport }}
 
+    - name: Run POSIX demo test
+      if: matrix.transport == 'tcp'
+      run: |
+        cd examples/posix/wh_posix_client
+        ./Build/wh_posix_client.elf --type ${{ matrix.transport }} --test
+
     # Optional: Kill the server process if it doesn't exit on its own
     - name: Cleanup POSIX server
       if: always()
diff --git a/examples/demo/client/wh_demo_client_crypto.c b/examples/demo/client/wh_demo_client_crypto.c
index 0b84327fa..3c14132aa 100644
--- a/examples/demo/client/wh_demo_client_crypto.c
+++ b/examples/demo/client/wh_demo_client_crypto.c
@@ -128,7 +128,7 @@ int wh_DemoClient_CryptoRsaImport(whClientContext* clientContext)
     int        keySz;
     int        needEvict     = 0;
     whKeyId    keyId         = WH_KEYID_ERASED;
-    char       keyFile[]     = "../../../demo/certs/rsa-2048-key.der";
+    char       keyFile[]     = "../../demo/certs/rsa-2048-key.der";
     const char plainString[] = "The quick brown fox jumps over the lazy dog.";
     char       keyLabel[]    = "baby's first key";
     uint8_t    keyBuf[2048];
@@ -329,13 +329,8 @@ int wh_DemoClient_CryptoCurve25519Import(whClientContext* clientContext)
     word32  outLen;
     whKeyId keyIdBob           = WH_KEYID_ERASED;
     whKeyId keyIdAlice         = WH_KEYID_ERASED;
-    #if 0
-    char    keyPairFileBob[]   = "../../../demo/certs/curve25519_keyBob.der";
-    char    keyPairFileAlice[] = "../../../demo/certs/curve25519_keyAlice.der";
-    #else
-    char    keyPairFileBob[]   = "../../../demo/certs/curve25519_keyBob.der";
-    char    keyPairFileAlice[] = "../../../demo/certs/curve25519_keyAlice.der";
-    #endif
+    char    keyPairFileBob[]   = "../../demo/certs/curve25519_keyBob.der";
+    char    keyPairFileAlice[] = "../../demo/certs/curve25519_keyAlice.der";
     char    keyLabel[]         = "baby's first key";
     uint8_t keyBuf[256];
     uint8_t sharedOne[CURVE25519_KEYSIZE];
@@ -609,8 +604,8 @@ int wh_DemoClient_CryptoEccImport(whClientContext* clientContext)
     whKeyId    keyIdBob   = WH_KEYID_ERASED;
     word32     outLen;
     word32     sigLen;
-    char       keyFileAlice[] = "../../../demo/certs/alice-ecc256-key.der";
-    char       keyFileBob[]   = "../../../demo/certs/bob-ecc256-key.der";
+    char       keyFileAlice[] = "../../demo/certs/alice-ecc256-key.der";
+    char       keyFileBob[]   = "../../demo/certs/bob-ecc256-key.der";
     char       keyLabel[]     = "baby's first key";
     ecc_key    aliceKey[1];
     ecc_key    bobKey[1];