diff --git a/tests/suites/test_suite_cipher.padding.data b/tests/suites/test_suite_cipher.padding.data
index 2cad0a9..8776a28 100644
--- a/tests/suites/test_suite_cipher.padding.data
+++ b/tests/suites/test_suite_cipher.padding.data
@@ -82,10 +82,70 @@
 depends_on:POLARSSL_CIPHER_PADDING_PKCS7
 check_padding:POLARSSL_PADDING_PKCS7:"DABBAD0002":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
 
-Check PKCS padding #7 (non-uniform padding bytes)
+Check PKCS padding #7 (non-uniform padding bytes #1)
 depends_on:POLARSSL_CIPHER_PADDING_PKCS7
 check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00030203":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
 
+Check PKCS padding #7 (non-uniform padding bytes #2)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00030103":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #3)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00030703":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #4)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00030b03":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #5)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00031303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #6)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00032303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #7)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00034203":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #8)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00038303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #9)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00020303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #10)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00010303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #11)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00070303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #12)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD000b0303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #13)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00130303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #14)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00230303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #15)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00420303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
+Check PKCS padding #7 (non-uniform padding bytes #16)
+depends_on:POLARSSL_CIPHER_PADDING_PKCS7
+check_padding:POLARSSL_PADDING_PKCS7:"DABBAD00830303":POLARSSL_ERR_CIPHER_INVALID_PADDING:0
+
 Check PKCS padding #8 (overlong)
 depends_on:POLARSSL_CIPHER_PADDING_PKCS7
 check_padding:POLARSSL_PADDING_PKCS7:"040404":POLARSSL_ERR_CIPHER_INVALID_PADDING:0