diff --git a/docs/changes.txt b/docs/changes.txt
index aa0ef815d..fbe1ba7a9 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -51,6 +51,7 @@
 - Skip chained generated rules that exceed the maximum number of function calls
 - Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives.
 - Fixed bug in --stdout that caused certain rules to malfunction
+- Fixed bug in grep out-of-memory workaround on Unit Test
 - Fixed build failed for 18400 with Apple Metal
 - Fixed build failed for 18600 with Apple Metal
 - Fixed display problem of the "Optimizers applied" list for algorithms using OPTI_TYPE_SLOW_HASH_SIMD_INIT2 and/or OPTI_TYPE_SLOW_HASH_SIMD_LOOP2
diff --git a/tools/test.sh b/tools/test.sh
index 62d297e63..d8b78efac 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -591,7 +591,7 @@ function attack_0()
 
           # out-of-memory, workaround
 
-          echo "${output}" | head -1 > tmp_file_out
+          echo "${output}" | grep -v "^Unsupported\|^$" | head -1 > tmp_file_out
           echo "${search}" > tmp_file_search
 
           out_md5=$(md5sum tmp_file_out | cut -d' ' -f1)
@@ -874,7 +874,7 @@ function attack_1()
 
             # out-of-memory, workaround
 
-            echo "${output}" | head -1 > tmp_file_out
+            echo "${output}" | grep -v "^Unsupported\|^$" | head -1 > tmp_file_out
             echo "${search}" > tmp_file_search
 
             out_md5=$(md5sum tmp_file_out | cut -d' ' -f1)
@@ -1180,7 +1180,7 @@ function attack_3()
 
           # out-of-memory, workaround
 
-          echo "${output}" | head -1 > tmp_file_out
+          echo "${output}" | grep -v "^Unsupported\|^$" | head -1 > tmp_file_out
           echo "${search}" > tmp_file_search
 
           out_md5=$(md5sum tmp_file_out | cut -d' ' -f1)
@@ -1840,9 +1840,10 @@ function attack_6()
           newRet=$?
 
           if [ "${newRet}" -eq 2 ]; then
+
             # out-of-memory, workaround
 
-            echo "${output}" | head -1 > tmp_file_out
+            echo "${output}" | grep -v "^Unsupported\|^$" | head -1 > tmp_file_out
             echo "${search}" > tmp_file_search
 
             out_md5=$(md5sum tmp_file_out | cut -d' ' -f1)
@@ -2273,7 +2274,7 @@ function attack_7()
 
             # out-of-memory, workaround
 
-            echo "${output}" | head -1 > tmp_file_out
+            echo "${output}" | grep -v "^Unsupported\|^$" | head -1 > tmp_file_out
             echo "${search}" > tmp_file_search
 
             out_md5=$(md5sum tmp_file_out | cut -d' ' -f1)
@@ -2287,7 +2288,6 @@ function attack_7()
           fi
 
           if [ "${newRet}" -ne 0 ]; then
-
             if [ "${newRet}" -eq 2 ]; then
               ret=20
             else