diff --git a/certs/include.am b/certs/include.am
index b7fad51e5..b32e88225 100644
--- a/certs/include.am
+++ b/certs/include.am
@@ -58,4 +58,5 @@ dist_doc_DATA+= certs/taoCert.txt
 
 EXTRA_DIST+= certs/ntru-key.raw
 
+include certs/test/include.am
 include certs/test-pathlen/include.am
diff --git a/certs/test/include.am b/certs/test/include.am
new file mode 100644
index 000000000..1ce926d3c
--- /dev/null
+++ b/certs/test/include.am
@@ -0,0 +1,12 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+#
+
+EXTRA_DIST += \
+	     certs/test/cert-ext-ia.cfg \
+	     certs/test/cert-ext-ia.der \
+	     certs/test/cert-ext-nc.cfg \
+	     certs/test/cert-ext-nc.der \
+	     certs/test/cert-ext-ns.der \
+	     certs/test/gen-ext-certs.sh
+
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 49be41814..9d9132437 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -881,7 +881,7 @@ int error_test()
      * APIs. Check that the values that are not errors map to the unknown
      * string.
      */
-    for (i = OPEN_RAN_E; i >= ECC_CDH_KAT_FIPS_E; i--) {
+    for (i = OPEN_RAN_E; i >= BAD_PATH_ERROR; i--) {
         errStr = wc_GetErrorString(i);
         wc_ErrorString(i, out);
 
@@ -1555,7 +1555,7 @@ int sha224_test(void)
     ret = wc_Sha224GetHash(&sha, hash);
     if (ret != 0)
         return -22;
-    ret = wc_Sha224Update(&sha, (byte*)a.input + 1, a.inLen - 1);
+    ret = wc_Sha224Update(&sha, (byte*)a.input + 1, (word32)(a.inLen - 1));
     if (ret != 0)
         return -23;
     ret = wc_Sha224Final(&sha, hash);
@@ -1563,7 +1563,7 @@ int sha224_test(void)
         return -24;
     if (XMEMCMP(hash, a.output, a.outLen) != 0)
         return -25;
-    ret = wc_Sha224Hash((byte*)a.input, a.inLen, hash);
+    ret = wc_Sha224Hash((byte*)a.input, (word32)a.inLen, hash);
     if (ret != 0)
         return -26;
     if (XMEMCMP(hash, a.output, a.outLen) != 0)
@@ -1799,7 +1799,7 @@ int sha384_test(void)
     ret = wc_Sha384GetHash(&sha, hash);
     if (ret != 0)
         return -22;
-    ret = wc_Sha384Update(&sha, (byte*)a.input + 1, a.inLen - 1);
+    ret = wc_Sha384Update(&sha, (byte*)a.input + 1, (word32)(a.inLen - 1));
     if (ret != 0)
         return -23;
     ret = wc_Sha384Final(&sha, hash);
@@ -1808,7 +1808,7 @@ int sha384_test(void)
     if (XMEMCMP(hash, a.output, a.outLen) != 0)
         return -25;
     XMEMSET(hash, 0, a.outLen);
-    ret = wc_Sha384Hash((byte*)a.input, a.inLen, hash);
+    ret = wc_Sha384Hash((byte*)a.input, (word32)a.inLen, hash);
     if (ret != 0)
         return -26;
     if (XMEMCMP(hash, a.output, a.outLen) != 0)