diff --git a/src/ssl.c b/src/ssl.c
index 2babb5841..e758aec58 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -21121,8 +21121,7 @@ void wolfSSL_AES_cbc_encrypt(const unsigned char *in, unsigned char* out,
 
     WOLFSSL_ENTER("wolfSSL_AES_cbc_encrypt");
 
-    if (key == NULL || in == NULL || out == NULL || iv == NULL ||
-        (int) len <= 0 ) {
+    if (key == NULL || in == NULL || out == NULL || iv == NULL || len == 0) {
         WOLFSSL_MSG("Error, Null argument passed in");
         return;
     }
diff --git a/tests/api.c b/tests/api.c
index ee44ca7f0..02c0a918c 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -20116,7 +20116,6 @@ static void test_wolfSSL_AES_cbc_encrypt()
     AES_KEY* aesN = NULL;
     size_t len = 0;
     size_t lenB = 0;
-    size_t lenN = -1;
     int keySz0 = 0;
     int keySzN = -1;
     byte out[AES_BLOCK_SIZE] = {0};
@@ -20167,7 +20166,6 @@ static void test_wolfSSL_AES_cbc_encrypt()
     AssertIntNE(XMEMCMP(out, ct128, AES_BLOCK_SIZE), 0);
 
     STRESS_T(pt128, out, lenB, &aes, iv128tmp, enc1, ct128, AES_BLOCK_SIZE, 0);
-    STRESS_T(pt128, out, lenN, &aes, iv128tmp, enc1, ct128, AES_BLOCK_SIZE, 0);
     printf(resultFmt, "Stress Tests: passed");
 
     printf(testingFmt, "Stressing wolfSSL_AES_set_encrypt_key");