diff --git a/aws-lc-rs/src/cipher/streaming.rs b/aws-lc-rs/src/cipher/streaming.rs
index aa7345bde7d..03103d0c660 100644
--- a/aws-lc-rs/src/cipher/streaming.rs
+++ b/aws-lc-rs/src/cipher/streaming.rs
@@ -5,6 +5,7 @@ use crate::cipher::{
     Algorithm, DecryptionContext, EncryptionContext, OperatingMode, UnboundCipherKey,
 };
 use crate::error::Unspecified;
+use crate::fips::indicator_check;
 use crate::ptr::{LcPtr, Pointer};
 use aws_lc::{
     EVP_CIPHER_CTX_new, EVP_CIPHER_iv_length, EVP_CIPHER_key_length, EVP_DecryptFinal_ex,
@@ -76,6 +77,7 @@ impl StreamingEncryptingKey {
             <usize>::try_from(unsafe { EVP_CIPHER_iv_length(*cipher) }).unwrap()
         );
 
+        // AWS-LC copies the key and iv values into the EVP_CIPHER_CTX, and thus can be dropped after this.
         if 1 != unsafe {
             EVP_EncryptInit_ex(
                 cipher_ctx.as_mut_ptr(),
@@ -155,13 +157,13 @@ impl StreamingEncryptingKey {
         }
         let mut outlen: i32 = 0;
 
-        if 1 != unsafe {
+        if 1 != indicator_check!(unsafe {
             EVP_EncryptFinal_ex(
                 self.cipher_ctx.as_mut_ptr(),
                 output.as_mut_ptr(),
                 &mut outlen,
             )
-        } {
+        }) {
             return Err(Unspecified);
         }
         let outlen: usize = outlen.try_into()?;
@@ -262,6 +264,7 @@ impl StreamingDecryptingKey {
             <usize>::try_from(unsafe { EVP_CIPHER_iv_length(*cipher) }).unwrap()
         );
 
+        // AWS-LC copies the key and iv values into the EVP_CIPHER_CTX, and thus can be dropped after this.
         if 1 != unsafe {
             EVP_DecryptInit_ex(
                 cipher_ctx.as_mut_ptr(),
@@ -336,7 +339,9 @@ impl StreamingDecryptingKey {
         }
         let mut outlen: i32 = 0;
 
-        if 1 != unsafe { EVP_DecryptFinal_ex(*self.cipher_ctx, output.as_mut_ptr(), &mut outlen) } {
+        if 1 != indicator_check!(unsafe {
+            EVP_DecryptFinal_ex(*self.cipher_ctx, output.as_mut_ptr(), &mut outlen)
+        }) {
             return Err(Unspecified);
         }
         let outlen: usize = outlen.try_into()?;
diff --git a/aws-lc-rs/src/cipher/tests/fips.rs b/aws-lc-rs/src/cipher/tests/fips.rs
index 0de23fd0939..6953f6a7529 100644
--- a/aws-lc-rs/src/cipher/tests/fips.rs
+++ b/aws-lc-rs/src/cipher/tests/fips.rs
@@ -6,7 +6,7 @@
 use crate::{
     cipher::{
         DecryptingKey, EncryptingKey, PaddedBlockDecryptingKey, PaddedBlockEncryptingKey,
-        UnboundCipherKey, AES_128, AES_256,
+        StreamingDecryptingKey, StreamingEncryptingKey, UnboundCipherKey, AES_128, AES_256,
     },
     fips::{assert_fips_status_indicator, FipsServiceStatus},
 };
@@ -49,15 +49,89 @@ macro_rules! block_api {
     };
 }
 
+macro_rules! streaming_api {
+    ($name:ident, $alg:expr, $encrypt_mode:path, $decrypt_mode:path, $key:expr) => {
+        #[test]
+        fn $name() {
+            let mut key = $encrypt_mode(UnboundCipherKey::new($alg, $key).unwrap()).unwrap();
+
+            let input = TEST_MESSAGE.as_bytes();
+            let mut encrypt_output = vec![0u8; TEST_MESSAGE.len() + $alg.block_len()];
+
+            let mut buffer_update = key.update(&input, &mut encrypt_output).unwrap();
+
+            let outlen = buffer_update.written().len();
+            let (context, buffer_update) = assert_fips_status_indicator!(
+                key.finish(buffer_update.remainder_mut()),
+                FipsServiceStatus::Approved
+            )
+            .unwrap();
+
+            let outlen = outlen + buffer_update.written().len();
+
+            let ciphertext = &encrypt_output[0..outlen];
+            let mut decrypt_output = vec![0u8; outlen + $alg.block_len()];
+            let mut key =
+                $decrypt_mode(UnboundCipherKey::new($alg, $key).unwrap(), context).unwrap();
+
+            let mut buffer_update = key.update(ciphertext, &mut decrypt_output).unwrap();
+
+            let outlen = buffer_update.written().len();
+            let buffer_update = assert_fips_status_indicator!(
+                key.finish(buffer_update.remainder_mut()),
+                FipsServiceStatus::Approved
+            )
+            .unwrap();
+
+            let outlen = outlen + buffer_update.written().len();
+            let plaintext = &decrypt_output[0..outlen];
+
+            assert_eq!(TEST_MESSAGE.as_bytes(), plaintext);
+        }
+    };
+}
+
+streaming_api!(
+    streaming_aes_128_cbc_pkcs7,
+    &AES_128,
+    StreamingEncryptingKey::cbc_pkcs7,
+    StreamingDecryptingKey::cbc_pkcs7,
+    &TEST_KEY_128_BIT
+);
+
+streaming_api!(
+    streaming_aes_128_ctr,
+    &AES_128,
+    StreamingEncryptingKey::ctr,
+    StreamingDecryptingKey::ctr,
+    &TEST_KEY_128_BIT
+);
+
+streaming_api!(
+    streaming_aes_256_cbc_pkcs7,
+    &AES_256,
+    StreamingEncryptingKey::cbc_pkcs7,
+    StreamingDecryptingKey::cbc_pkcs7,
+    &TEST_KEY_256_BIT
+);
+streaming_api!(
+    streaming_aes_256_ctr,
+    &AES_256,
+    StreamingEncryptingKey::ctr,
+    StreamingDecryptingKey::ctr,
+    &TEST_KEY_256_BIT
+);
+
 block_api!(
-    aes_126_cbc_pkcs7,
+    block_aes_128_cbc_pkcs7,
     &AES_128,
     PaddedBlockEncryptingKey::cbc_pkcs7,
     PaddedBlockDecryptingKey::cbc_pkcs7,
     &TEST_KEY_128_BIT
 );
+
 block_api!(
-    aes_126_ctr,
+    block_aes_128_ctr,
     &AES_128,
     EncryptingKey::ctr,
     DecryptingKey::ctr,
@@ -65,14 +139,14 @@ block_api!(
 );
 
 block_api!(
-    aes_256_cbc_pkcs7,
+    block_aes_256_cbc_pkcs7,
     &AES_256,
     PaddedBlockEncryptingKey::cbc_pkcs7,
     PaddedBlockDecryptingKey::cbc_pkcs7,
     &TEST_KEY_256_BIT
 );
 block_api!(
-    aes_256_ctr,
+    block_aes_256_ctr,
     &AES_256,
     EncryptingKey::ctr,
     DecryptingKey::ctr,