diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index ac575c8a3d..86ead9c27c 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -7215,6 +7215,19 @@ test_pdcp_proto_cplane_encap(int i)
 		pdcp_test_data_in_len[i]+4);
 }
 
+int
+test_pdcp_proto_uplane_encap(int i)
+{
+	return test_pdcp_proto(i, 0,
+		RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+		RTE_CRYPTO_AUTH_OP_GENERATE,
+		pdcp_test_data_in[i],
+		pdcp_test_data_in_len[i],
+		pdcp_test_data_out[i],
+		pdcp_test_data_in_len[i]);
+
+}
+
 int
 test_pdcp_proto_cplane_decap(int i)
 {
@@ -11647,6 +11660,9 @@ static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
 
 		TEST_CASE_ST(ut_setup, ut_teardown,
 			test_PDCP_PROTO_cplane_decap_all),
+
+		TEST_CASE_ST(ut_setup, ut_teardown,
+			test_PDCP_PROTO_uplane_encap_all),
 #endif
 		/** AES GCM Authenticated Encryption */
 		TEST_CASE_ST(ut_setup, ut_teardown,
@@ -11759,6 +11775,9 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
 
 		TEST_CASE_ST(ut_setup, ut_teardown,
 			test_PDCP_PROTO_cplane_decap_all),
+
+		TEST_CASE_ST(ut_setup, ut_teardown,
+			test_PDCP_PROTO_uplane_encap_all),
 #endif
 		/** AES GCM Authenticated Encryption */
 		TEST_CASE_ST(ut_setup, ut_teardown,
diff --git a/app/test/test_cryptodev_security_pdcp.c b/app/test/test_cryptodev_security_pdcp.c
index 803fc1dfc5..7c82042085 100644
--- a/app/test/test_cryptodev_security_pdcp.c
+++ b/app/test/test_cryptodev_security_pdcp.c
@@ -73,6 +73,32 @@ cplane_decap(uint32_t sn_size, uint8_t dir,
 	return test_pdcp_proto_cplane_decap(i);
 }
 
+static int uplane_encap_no_integrity(uint32_t sn_size, uint8_t dir,
+		enum enc_alg_off enc_alg_off)
+{
+	int i = PDCP_UPLANE_OFFSET + ((dir == 0) ? UPLINK : DOWNLINK) +
+			enc_alg_off;
+
+	switch (sn_size) {
+	case 7:
+		i += SHORT_SEQ_NUM_OFFSET;
+		break;
+	case 15:
+		i += FIFTEEN_BIT_SEQ_NUM_OFFSET;
+		break;
+	case 12:
+		i += LONG_SEQ_NUM_OFFSET;
+		break;
+	case 18:
+		i += EIGHTEEN_BIT_SEQ_NUM_OFFSET;
+		break;
+	default:
+		printf("\nInvalid SN: %u\n", sn_size);
+	}
+
+	return test_pdcp_proto_uplane_encap(i);
+}
+
 #define TEST_PDCP_COUNT(func) do {			\
 	if (func == TEST_SUCCESS)  {			\
 		printf("\t%d)", n++);			\
@@ -243,3 +269,50 @@ test_PDCP_PROTO_cplane_decap_all(void)
 
 	return n - i;
 };
+
+int
+test_PDCP_PROTO_uplane_encap_all(void)
+{
+	int i = 0, n = 0;
+
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, UPLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, DOWNLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, UPLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, DOWNLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, UPLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, DOWNLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, UPLINK, NULL_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, DOWNLINK, NULL_ENC));
+
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, UPLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, DOWNLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, UPLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, DOWNLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, UPLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, DOWNLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, UPLINK, SNOW_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, DOWNLINK, SNOW_ENC));
+
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, UPLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, DOWNLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, UPLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, DOWNLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, UPLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, DOWNLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, UPLINK, AES_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, DOWNLINK, AES_ENC));
+
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, UPLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(12, DOWNLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, UPLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(7, DOWNLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, UPLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(15, DOWNLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, UPLINK, ZUC_ENC));
+	TEST_PDCP_COUNT(uplane_encap_no_integrity(18, DOWNLINK, ZUC_ENC));
+
+	if (n - i)
+		printf("## %s: %d passed out of %d\n", __func__, i, n);
+
+	return n - i;
+};
diff --git a/app/test/test_cryptodev_security_pdcp_test_func.h b/app/test/test_cryptodev_security_pdcp_test_func.h
index 21a6e8a48f..7051790c8f 100644
--- a/app/test/test_cryptodev_security_pdcp_test_func.h
+++ b/app/test/test_cryptodev_security_pdcp_test_func.h
@@ -7,6 +7,7 @@
 
 #define PDCP_CPLANE_OFFSET		0
 #define PDCP_CPLANE_LONG_SN_OFFSET	32
+#define PDCP_UPLANE_OFFSET		64
 #define LONG_SEQ_NUM_OFFSET		0
 #define SHORT_SEQ_NUM_OFFSET		2
 #define FIFTEEN_BIT_SEQ_NUM_OFFSET	4
@@ -16,6 +17,9 @@
 /* key length(in bytes) for F8 */
 #define F8_KEY_LEN			16
 
+#define PDCP_UPLANE_12BIT_OFFSET	(PDCP_UPLANE_OFFSET + 32)
+#define PDCP_UPLANE_18BIT_OFFSET	(PDCP_UPLANE_12BIT_OFFSET + 32)
+
 enum enc_alg_off {
 	NULL_ENC = 0,
 	SNOW_ENC = 8,
@@ -30,9 +34,11 @@ enum auth_alg_off {
 };
 
 int test_pdcp_proto_cplane_encap(int i);
+int test_pdcp_proto_uplane_encap(int i);
 int test_pdcp_proto_cplane_decap(int i);
 
 int test_PDCP_PROTO_cplane_encap_all(void);
 int test_PDCP_PROTO_cplane_decap_all(void);
+int test_PDCP_PROTO_uplane_encap_all(void);
 
 #endif /* SECURITY_PDCP_TEST_FUNC_H_ */
diff --git a/app/test/test_cryptodev_security_pdcp_test_vectors.h b/app/test/test_cryptodev_security_pdcp_test_vectors.h
index 8476a61f7c..1c6e5f83c7 100644
--- a/app/test/test_cryptodev_security_pdcp_test_vectors.h
+++ b/app/test/test_cryptodev_security_pdcp_test_vectors.h
@@ -605,6 +605,294 @@ static struct pdcp_test_param pdcp_test_params[] = {
 	 .cipher_key_len = 16,
 	 .auth_key_len = 16,
 	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Uplink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Downlink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Uplink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Downlink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Uplink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Downlink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Uplink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with NULL encryption Downlink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_NULL,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 0,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Uplink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Downlink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Uplink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Downlink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Uplink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Downlink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Uplink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with SNOW f8 encryption Downlink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Uplink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Downlink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Uplink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Downlink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Uplink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Downlink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Uplink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with AES CTR encryption Downlink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Uplink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Downlink with long sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Uplink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Downlink with short sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Uplink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Downlink with 15 bit sequence number",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Uplink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
+	{
+	 .name =
+	 "PDCP User Plane with ZUC encryption Downlink with 18 bit SN",
+	 .cipher_alg = RTE_CRYPTO_CIPHER_ZUC_EEA3,
+	 .auth_alg = 0,
+	 .domain = RTE_SECURITY_PDCP_MODE_DATA,
+	 .cipher_key_len = 16,
+	 .auth_key_len = 0,
+	 },
 };
 
 static uint32_t pdcp_test_hfn[] = {
@@ -740,6 +1028,72 @@ static uint32_t pdcp_test_hfn[] = {
 	0x01,
 
 	/* 12-bit C-plane ends ***********************/
+
+	/* User Plane w/NULL enc. UL LONG SN */
+	0x000fa557,
+	/* User Plane w/NULL enc. DL LONG SN */
+	0x000fa557,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	0x000fa557,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	0x000fa557,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/NULL enc. UL 18-bit SN */
+	0x01,
+	/* User Plane w/NULL enc. DL 18-bit SN */
+	0x01,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	0x000fa557,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	0x000fa557,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	0x000fa557,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	0x000fa557,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/SNOW f8 enc. UL 18-bit SN */
+	0x01,
+	/* User Plane w/SNOW f8 enc. DL 18-bit SN */
+	0x01,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	0x000fa557,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	0x000fa557,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	0x000fa557,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	0x000fa557,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/AES CTR enc. UL 18-bit SN */
+	0x01,
+	/* User Plane w/AES CTR enc. DL 18-bit SN */
+	0x01,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	0x000fa557,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	0x000fa557,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	0x000fa557,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	0x000fa557,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	0x000fa557,
+	/* User Plane w/ZUC enc. UL 18-bit SN */
+	0x01,
+	/* User Plane w/ZUC enc. DL 18-bit SN */
+	0x01,
+
 };
 
 static uint32_t pdcp_test_hfn_threshold[] = {
@@ -873,6 +1227,72 @@ static uint32_t pdcp_test_hfn_threshold[] = {
 	0x70C0A,
 	/* Control Plane w/ZUC enc. + ZUC int. DL */
 	0x70C0A,
+
+	/* User Plane w/NULL enc. UL LONG SN */
+	0x000fa558,
+	/* User Plane w/NULL enc. DL LONG SN */
+	0x000fa558,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	0x000fa558,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	0x000fa558,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/NULL enc. UL 18-bit SN */
+	0x00002195,
+	/* User Plane w/NULL enc. DL 18-bit SN */
+	0x00002195,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	0x000fa558,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	0x000fa558,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	0x000fa558,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	0x000fa558,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/SNOW f8 enc. UL 18-bit SN */
+	0x00000791,
+	/* User Plane w/SNOW f8 enc. DL 18-bit SN */
+	0x00002195,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	0x000fa558,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	0x000fa558,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	0x000fa558,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	0x000fa558,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/AES CTR enc. UL 18-bit SN */
+	0x00000791,
+	/* User Plane w/AES CTR enc. DL 18-bit SN */
+	0x00002195,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	0x000fa558,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	0x000fa558,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	0x000fa558,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	0x000fa558,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	0x000fa558,
+	/* User Plane w/ZUC enc. UL for 18-bit SN*/
+	0x00000791,
+	/* User Plane w/ZUC enc. DL for 18-bit SN*/
+	0x00002195,
+
 };
 
 static uint8_t pdcp_test_bearer[] = {
@@ -1006,6 +1426,72 @@ static uint8_t pdcp_test_bearer[] = {
 	0x16,
 	/* Control Plane w/ZUC enc. + ZUC int. DL */
 	0x16,
+
+	/* User Plane w/NULL enc. UL LONG SN */
+	0x03,
+	/* User Plane w/NULL enc. DL LONG SN */
+	0x03,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	0x03,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	0x03,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	0x03,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	0x03,
+	/* User Plane w/NULL enc. UL 18-bit SN */
+	0x16,
+	/* User Plane w/NULL enc. DL 18-bit SN */
+	0x16,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	0x03,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	0x03,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	0x03,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	0x03,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	0x03,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	0x03,
+	/* User Plane w/SNOW f8 enc. UL 18-bit SN */
+	0x0B,
+	/* User Plane w/SNOW f8 enc. DL 18-bit SN */
+	0x16,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	0x03,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	0x03,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	0x03,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	0x03,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	0x03,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	0x03,
+	/* User Plane w/AES CTR enc. UL 18-bit SN */
+	0x0B,
+	/* User Plane w/AES CTR enc. DL 18-bit SN */
+	0x16,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	0x03,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	0x03,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	0x03,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	0x03,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	0x03,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	0x03,
+	/* User Plane w/ZUC enc. UL 18-bit SN */
+	0x0B,
+	/* User Plane w/ZUC enc. DL 18-bit SN */
+	0x16,
+
 };
 
 static uint8_t pdcp_test_packet_direction[] = {
@@ -1139,6 +1625,72 @@ static uint8_t pdcp_test_packet_direction[] = {
 	PDCP_DIR_UPLINK,
 	/* Control Plane w/ZUC enc. + ZUC int. DL */
 	PDCP_DIR_DOWNLINK,
+
+	/* User Plane w/NULL enc. UL LONG SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/NULL enc. DL LONG SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/NULL enc. UL 18-bit SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/NULL enc. DL 18-bit SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/SNOW f8 enc. UL 18-bit SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/SNOW f8 enc. DL 18-bit SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/AES CTR enc. UL 18-bit SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/AES CTR enc. DL 18-bit SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	PDCP_DIR_DOWNLINK,
+	/* User Plane w/ZUC enc. UL for 18-bit SN */
+	PDCP_DIR_UPLINK,
+	/* User Plane w/ZUC enc. DL for 18-bit SN */
+	PDCP_DIR_DOWNLINK,
+
 };
 
 static uint8_t pdcp_test_data_sn_size[] = {
@@ -1273,6 +1825,72 @@ static uint8_t pdcp_test_data_sn_size[] = {
 	/* Control Plane w/ZUC enc. + ZUC int. DL */
 	12,
 	/*************** 12 bit SN for C-plane end **************************/
+
+	/* User Plane w/NULL enc. UL LONG SN */
+	12,
+	/* User Plane w/NULL enc. DL LONG SN */
+	12,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	7,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	7,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	15,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	15,
+	/* User Plane w/NULL enc. UL 18 BIT SN */
+	18,
+	/* User Plane w/NULL enc. DL 18 BIT SN */
+	18,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	12,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	12,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	7,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	7,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	15,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	15,
+	/* User Plane w/SNOW f8 enc. UL 18 BIT SN */
+	18,
+	/* User Plane w/SNOW f8 enc. DL 18 BIT SN */
+	18,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	12,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	12,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	7,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	7,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	15,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	15,
+	/* User Plane w/AES CTR enc. UL 18 BIT SN */
+	18,
+	/* User Plane w/AES CTR enc. DL 18 BIT SN */
+	18,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	12,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	12,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	7,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	7,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	15,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	15,
+	/* User Plane w/ZUC enc. UL 18 BIT SN */
+	18,
+	/* User Plane w/ZUC enc. DL 18 BIT SN */
+	18,
+
 };
 
 static uint8_t *pdcp_test_crypto_key[] = {
@@ -1466,6 +2084,101 @@ static uint8_t *pdcp_test_crypto_key[] = {
 	(uint8_t[]){0x40, 0x19, 0xE2, 0x99, 0x16, 0xC3, 0x7E, 0x9B, 0xA6, 0x8F,
 		    0x57, 0xBE, 0x97, 0xFD, 0x02, 0xCB},
 
+	/* User Plane w/NULL enc. UL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/NULL enc. DL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/NULL enc. UL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/NULL enc. DL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/NULL enc. UL for 18-bit SN*/
+	NULL,
+	/* User Plane w/NULL enc. DL for 18-bit SN*/
+	NULL,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/SNOW enc. UL for 18-bit SN*/
+	(uint8_t[]){0x60, 0x4C, 0x8A, 0x22, 0x89, 0x56, 0x13, 0x51, 0x7D, 0x61,
+		    0xE5, 0xE0, 0x7B, 0x2B, 0xD0, 0x9E},
+	/* User Plane w/SNOW enc. DL for 18-bit SN*/
+	(uint8_t[]){0x40, 0x19, 0xE2, 0x99, 0x16, 0xC3, 0x7E, 0x9B, 0xA6, 0x8F,
+		    0x57, 0xBE, 0x97, 0xFD, 0x02, 0xCB},
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/AES enc. UL for 18-bit SN*/
+	(uint8_t[]){0x60, 0x4C, 0x8A, 0x22, 0x89, 0x56, 0x13, 0x51, 0x7D, 0x61,
+		    0xE5, 0xE0, 0x7B, 0x2B, 0xD0, 0x9E},
+	/* User Plane w/AES enc. DL for 18-bit SN*/
+	(uint8_t[]){0x40, 0x19, 0xE2, 0x99, 0x16, 0xC3, 0x7E, 0x9B, 0xA6, 0x8F,
+		    0x57, 0xBE, 0x97, 0xFD, 0x02, 0xCB},
+	/* User Plane w/ZUC enc. UL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/ZUC enc. DL LONG SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	(uint8_t[]){0x5a, 0xcb, 0x1d, 0x64, 0x4c, 0x0d, 0x51, 0x20, 0x4e, 0xa5,
+		    0xf1, 0x45, 0x10, 0x10, 0xd8, 0x52},
+	/* User Plane w/ZUC enc. UL for 18-bit SN*/
+	(uint8_t[]){0x60, 0x4C, 0x8A, 0x22, 0x89, 0x56, 0x13, 0x51, 0x7D, 0x61,
+		    0xE5, 0xE0, 0x7B, 0x2B, 0xD0, 0x9E},
+	/* User Plane w/ZUC enc. DL for 18-bit SN*/
+	(uint8_t[]){0x40, 0x19, 0xE2, 0x99, 0x16, 0xC3, 0x7E, 0x9B, 0xA6, 0x8F,
+		    0x57, 0xBE, 0x97, 0xFD, 0x02, 0xCB},
+
 };
 
 static uint8_t *pdcp_test_auth_key[] = {
@@ -1658,6 +2371,71 @@ static uint8_t *pdcp_test_auth_key[] = {
 	(uint8_t[]){0x4D, 0x4B, 0x2B, 0x1E, 0x39, 0x60, 0x0A, 0x98, 0xC1, 0x3C,
 		    0x98, 0x82, 0xDC, 0xB6, 0xC2, 0x36},
 
+	/* User Plane w/NULL enc. UL LONG SN */
+	NULL,
+	/* User Plane w/NULL enc. DL LONG SN */
+	NULL,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	NULL,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	NULL,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	NULL,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	NULL,
+	/* User Plane w/NULL enc. UL 18 BIT SN */
+	NULL,
+	/* User Plane w/NULL enc. DL 18 BIT SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. UL 18 BIT SN */
+	NULL,
+	/* User Plane w/SNOW f8 enc. DL 18 BIT SN */
+	NULL,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	NULL,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	NULL,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	NULL,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	NULL,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	NULL,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	NULL,
+	/* User Plane w/AES CTR enc. UL 18 BIT SN */
+	NULL,
+	/* User Plane w/AES CTR enc. DL 18 BIT SN */
+	NULL,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	NULL,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	NULL,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	NULL,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	NULL,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	NULL,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	NULL,
+	/* User Plane w/ZUC enc. UL 18 BIT SN */
+	NULL,
+	/* User Plane w/ZUC enc. DL 18 BIT SN */
+	NULL,
+
 };
 
 static uint8_t *pdcp_test_data_in[] = {
@@ -1987,6 +2765,143 @@ static uint8_t *pdcp_test_data_in[] = {
 		    0x36, 0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70,
 		    0x1B, 0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD},
 
+	/* User Plane w/NULL enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. UL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/NULL enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/SNOW enc. UL for 18-bit SN*/
+	(uint8_t[]){0x0C, 0x00, 0x01, 0xB8, 0x33, 0x4F, 0x85, 0x8C, 0x2C, 0x65, 0x7D,
+		    0x8F, 0x5D, 0x40, 0x57, 0x60, 0x52, 0x4F, 0xB9, 0xF1, 0x69, 0xE9,
+		    0x68, 0x04, 0xFC, 0x7A, 0xBE, 0xD2, 0x5B, 0x4A, 0x21, 0x7F, 0x13,
+		    0x52, 0x08, 0xBA, 0xBD, 0x69, 0x51, 0xC9, 0x63, 0xCF, 0x06, 0x62,
+		    0x31, 0xA2, 0x76, 0xBA, 0xFC, 0x5A, 0xDB, 0xAA, 0xA3, 0x0B, 0x6A,
+		    0xD2, 0xEE, 0xD6, 0x93, 0xE4, 0x1B, 0x11, 0x4F, 0xC4, 0xD7, 0xDA,
+		    0x91, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/SNOW enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/AES enc. UL for 18-bit SN*/
+	(uint8_t[]){0x0C, 0x00, 0x01, 0xB8, 0x33, 0x4F, 0x85, 0x8C, 0x2C, 0x65, 0x7D,
+		    0x8F, 0x5D, 0x40, 0x57, 0x60, 0x52, 0x4F, 0xB9, 0xF1, 0x69, 0xE9,
+		    0x68, 0x04, 0xFC, 0x7A, 0xBE, 0xD2, 0x5B, 0x4A, 0x21, 0x7F, 0x13,
+		    0x52, 0x08, 0xBA, 0xBD, 0x69, 0x51, 0xC9, 0x63, 0xCF, 0x06, 0x62,
+		    0x31, 0xA2, 0x76, 0xBA, 0xFC, 0x5A, 0xDB, 0xAA, 0xA3, 0x0B, 0x6A,
+		    0xD2, 0xEE, 0xD6, 0x93, 0xE4, 0x1B, 0x11, 0x4F, 0xC4, 0xD7, 0xDA,
+		    0x91, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/AES enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/ZUC enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/ZUC enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/ZUC enc. UL for 18-bit SN*/
+	(uint8_t[]){0x0C, 0x00, 0x01, 0xB8, 0x33, 0x4F, 0x85, 0x8C, 0x2C, 0x65, 0x7D,
+		    0x8F, 0x5D, 0x40, 0x57, 0x60, 0x52, 0x4F, 0xB9, 0xF1, 0x69, 0xE9,
+		    0x68, 0x04, 0xFC, 0x7A, 0xBE, 0xD2, 0x5B, 0x4A, 0x21, 0x7F, 0x13,
+		    0x52, 0x08, 0xBA, 0xBD, 0x69, 0x51, 0xC9, 0x63, 0xCF, 0x06, 0x62,
+		    0x31, 0xA2, 0x76, 0xBA, 0xFC, 0x5A, 0xDB, 0xAA, 0xA3, 0x0B, 0x6A,
+		    0xD2, 0xEE, 0xD6, 0x93, 0xE4, 0x1B, 0x11, 0x4F, 0xC4, 0xD7, 0xDA,
+		    0x91, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/ZUC enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+
 };
 
 static uint32_t pdcp_test_data_in_len[] = {
@@ -2124,6 +3039,72 @@ static uint32_t pdcp_test_data_in_len[] = {
 	/* Control Plane w/ZUC enc. + ZUC int. DL */
 	66,
 
+
+	/* User Plane w/NULL enc. UL LONG SN */
+	17,
+	/* User Plane w/NULL enc. DL LONG SN */
+	17,
+	/* User Plane w/NULL enc. UL SHORT SN */
+	16,
+	/* User Plane w/NULL enc. DL SHORT SN */
+	16,
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	17,
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	17,
+	/* User Plane w/NULL enc. UL 18 BIT SN */
+	71,
+	/* User Plane w/NULL enc. DL 18 BIT SN */
+	71,
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	17,
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	17,
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	16,
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	16,
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	17,
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	17,
+	/* User Plane w/SNOW f8 enc. UL 18 BIT SN */
+	71,
+	/* User Plane w/SNOW f8 enc. DL 18 BIT SN */
+	71,
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	17,
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	17,
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	16,
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	16,
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	17,
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	17,
+	/* User Plane w/AES CTR enc. UL 18 BIT SN */
+	71,
+	/* User Plane w/AES CTR enc. DL 18 BIT SN */
+	71,
+	/* User Plane w/ZUC enc. UL LONG SN */
+	17,
+	/* User Plane w/ZUC enc. DL LONG SN */
+	17,
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	16,
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	16,
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	17,
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	17,
+	/* User Plane w/ZUC enc. UL 18 BIT SN */
+	71,
+	/* User Plane w/ZUC enc. DL 18 BIT SN */
+	71,
+
 };
 
 static uint8_t *pdcp_test_data_out[] = {
@@ -2486,6 +3467,138 @@ static uint8_t *pdcp_test_data_out[] = {
 		    0x85, 0xAF, 0x0A, 0xFF, 0xAC, 0x6A, 0x00, 0x19, 0xC1, 0x51,
 		    0x53, 0xDE, 0x78, 0x07, 0x6D, 0x10, 0xE6, 0x25, 0xE6, 0x7A},
 
+	/* User Plane w/NULL enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4, 0x57,
+		    0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xad, 0x9c, 0x44, 0x1f, 0x89, 0x0b, 0x38, 0xc4,
+		    0x57, 0xa4, 0x9d, 0x42, 0x14, 0x07, 0xe8},
+	/* User Plane w/NULL enc. UL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/NULL enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0xF8, 0xDB, 0x2D, 0x3F, 0x23, 0x82, 0x53, 0xFD,
+		    0x37, 0xDE, 0x88, 0x63, 0x08, 0x4F, 0xD3, 0x71, 0xFB, 0xEB, 0x35,
+		    0xF3, 0x64, 0xD3, 0x5E, 0xAF, 0x3F, 0x57, 0xC2, 0xE2, 0x91, 0x91,
+		    0xA3, 0x9C, 0xE6, 0x30, 0x69, 0x70, 0x33, 0x8A, 0x15, 0xD0, 0x36,
+		    0x47, 0x0E, 0x8F, 0xEE, 0x2C, 0x96, 0x0C, 0xD7, 0x7D, 0x70, 0x1B,
+		    0x01, 0x7F, 0x96, 0x46, 0x53, 0xB0, 0xA4, 0x7A, 0xF9, 0xDD, 0xCC,
+		    0x69, 0x00, 0x00, 0x00, 0x00},
+	/* User Plane w/SNOW f8 enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0x7a, 0xe0, 0x00, 0x07, 0x2a, 0xa6, 0xef, 0xdc,
+		    0x75, 0xef, 0x2e, 0x27, 0x0f, 0x69, 0x3d},
+	/* User Plane w/SNOW f8 enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0x7e, 0xbb, 0x80, 0x20, 0xba, 0xef, 0xe7, 0xf7,
+		    0xef, 0x69, 0x51, 0x85, 0x09, 0xa5, 0xab},
+	/* User Plane w/SNOW f8 enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0x80, 0xcf, 0xe5, 0x27, 0xe2, 0x88, 0x2a, 0xac, 0xc5,
+		    0xaf, 0x49, 0x9b, 0x3e, 0x48, 0x89},
+	/* User Plane w/SNOW f8 enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xe2, 0x51, 0x58, 0x88, 0xff, 0x1a, 0x00, 0xe4, 0x67,
+		    0x05, 0x46, 0x24, 0x2f, 0x07, 0xb7},
+	/* User Plane w/SNOW f8 enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xbe, 0x72, 0x05, 0x78, 0x92, 0xec, 0xb1, 0x4f,
+		    0xdd, 0x5d, 0xfc, 0x60, 0x2c, 0x9a, 0x85},
+	/* User Plane w/SNOW f8 enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0x0b, 0x50, 0xf3, 0xff, 0x37, 0xe3, 0x6b, 0xaf,
+		    0x08, 0xd8, 0xf6, 0x1f, 0xca, 0x6f, 0xbc},
+	/* User Plane w/SNOW enc. UL for 18-bit SN*/
+	(uint8_t[]){0x0C, 0x00, 0x01, 0x9A, 0xAF, 0x1D, 0x21, 0x2F, 0x48, 0xB2, 0x30,
+		    0xCF, 0xBB, 0x8A, 0x2C, 0xB7, 0x57, 0xB6, 0x27, 0x89, 0x0D, 0x91,
+		    0x03, 0x2C, 0x2B, 0x8D, 0x29, 0x4A, 0xBD, 0x8D, 0x48, 0xD2, 0x69,
+		    0x37, 0xB1, 0xA1, 0x97, 0x12, 0xBD, 0x0A, 0x91, 0x4D, 0xEB, 0x76,
+		    0xC8, 0x96, 0x7A, 0x0A, 0x25, 0x08, 0xEB, 0x41, 0x30, 0x00, 0x33,
+		    0xC7, 0xFF, 0x33, 0x4E, 0xC1, 0xFE, 0x5C, 0x0F, 0x15, 0xE7, 0x9F,
+		    0x31, 0x55, 0xDA, 0x18, 0x4D},
+	/* User Plane w/SNOW enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0x22, 0x2D, 0x15, 0xBA, 0x95, 0xAC, 0x47, 0x5A,
+		0xE3, 0x90, 0x82, 0xEA, 0xC2, 0x93, 0x80, 0x23, 0xE9, 0xAC, 0xEA, 0x5D,
+		0xAA, 0x70, 0x42, 0x04, 0x7C, 0xE6, 0xA6, 0x1D, 0x91, 0xAE, 0x2E, 0x43,
+		0x60, 0x39, 0x23, 0x06, 0xD2, 0x31, 0x73, 0x98, 0xF0, 0x61, 0x47, 0xB5,
+		0xC4, 0xB0, 0xB8, 0x31, 0x50, 0x9E, 0x37, 0x15, 0x0E, 0x0D, 0x29, 0x9D,
+		0xB3, 0x78, 0xFB, 0x9D, 0x5C, 0x90, 0xF8, 0x80, 0x53, 0x93, 0xEF, 0x7C},
+	/* User Plane w/AES CTR enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xde, 0x0a, 0x59, 0xca, 0x7d, 0x93, 0xa3, 0xb5,
+		    0xd2, 0x88, 0xb3, 0x04, 0xa2, 0x12, 0x09},
+	/* User Plane w/AES CTR enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0x69, 0x92, 0x25, 0xd8, 0xe9, 0xd5, 0xe9, 0x53,
+		    0x60, 0x49, 0x9f, 0xe9, 0x8f, 0xbe, 0x6a},
+	/* User Plane w/AES CTR enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0x0f, 0xa1, 0xf2, 0x56, 0x6e, 0xee, 0x62, 0x1c, 0x62,
+		    0x06, 0x7e, 0x38, 0x4a, 0x02, 0xa4},
+	/* User Plane w/AES CTR enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0x00, 0x8d, 0x50, 0x80, 0x30, 0xda, 0xc7, 0x14, 0xc5,
+		    0xe0, 0xc8, 0xfb, 0x83, 0xd0, 0x73},
+	/* User Plane w/AES CTR enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xa1, 0x2e, 0xa3, 0x64, 0xa9, 0x81, 0xbc, 0xd3,
+		    0x6f, 0xef, 0xee, 0x30, 0x71, 0x23, 0x85},
+	/* User Plane w/AES CTR enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xc7, 0xf2, 0x23, 0xb3, 0xbe, 0xc0, 0xdf, 0xc5,
+		    0xed, 0x37, 0x35, 0x7c, 0x66, 0xa3, 0xf9},
+	/* User Plane w/AES enc. UL for 18-bit SN*/
+	(uint8_t[]){0x0C, 0x00, 0x01, 0xBF, 0x31, 0x94, 0xCF, 0x6E, 0x99, 0x84, 0x08,
+		0xF1, 0x90, 0xC2, 0x22, 0xD0, 0xD2, 0x3D, 0x44, 0x75, 0x7F, 0xC5, 0x0F,
+		0xAC, 0x7C, 0x18, 0x46, 0xA5, 0x3E, 0x2F, 0x0F, 0x26, 0x9E, 0x5A, 0x49,
+		0xF7, 0xCB, 0x70, 0x17, 0xBC, 0x01, 0x1D, 0xA3, 0x65, 0x0E, 0x4B, 0x53,
+		0x14, 0x73, 0x76, 0xDE, 0x54, 0xA0, 0xF9, 0x4C, 0xC2, 0x8F, 0x02, 0x88,
+		0x36, 0xC7, 0xC4, 0x5A, 0x57, 0x7D, 0xA1, 0x0D, 0xC1, 0x66, 0x96, 0xC8},
+	/* User Plane w/AES enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0x01, 0x0D, 0x4B, 0x5E, 0xD3, 0xCE, 0x96, 0xE1,
+		0x9A, 0x9D, 0xB3, 0x01, 0xD6, 0x40, 0x50, 0x00, 0x6C, 0x63, 0xFD, 0x37,
+		0xD9, 0xBB, 0x3B, 0x76, 0xE5, 0x7D, 0x3C, 0xFC, 0xE3, 0x9D, 0x45, 0x4A,
+		0x07, 0x14, 0xD3, 0x14, 0xBC, 0x7E, 0x57, 0xAB, 0xB0, 0x8D, 0x8F, 0x42,
+		0x39, 0x22, 0xB2, 0xF6, 0x5F, 0xBD, 0x58, 0xE3, 0xE0, 0xDB, 0xD5, 0x7F,
+		0xFB, 0x78, 0x95, 0xE1, 0x5E, 0x36, 0xF8, 0x52, 0x98, 0x15, 0x68, 0x35},
+	/* User Plane w/ZUC enc. UL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0xfb, 0xb6, 0x0e, 0x81, 0xa1, 0x9e, 0xc8, 0xeb,
+		    0x90, 0xa8, 0xc7, 0x0e, 0x27, 0xcb, 0xb0},
+	/* User Plane w/ZUC enc. DL LONG SN */
+	(uint8_t[]){0x8b, 0x26, 0x2f, 0x5d, 0xa4, 0x82, 0xfb, 0xce, 0x1f, 0x3a,
+		    0xb5, 0x66, 0x60, 0x40, 0x65, 0x2b, 0x40},
+	/* User Plane w/ZUC enc. UL SHORT SN */
+	(uint8_t[]){0x8b, 0xcb, 0x75, 0x03, 0xd5, 0xed, 0xea, 0x73, 0x39, 0xf5,
+		    0x07, 0x03, 0x04, 0x51, 0xc9, 0x5e},
+	/* User Plane w/ZUC enc. DL SHORT SN */
+	(uint8_t[]){0x8b, 0xe9, 0xd2, 0x49, 0x7f, 0xfd, 0x98, 0x9f, 0xc4, 0x6a,
+		    0xcb, 0xe6, 0x4e, 0x21, 0x33, 0xd2},
+	/* User Plane w/ZUC enc. UL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0x01, 0x0a, 0xba, 0x79, 0xf8, 0xe5, 0x9f, 0x22,
+		    0x37, 0xab, 0x5c, 0x7e, 0xad, 0xd6, 0x6b},
+	/* User Plane w/ZUC enc. DL 15 BIT SN */
+	(uint8_t[]){0x8b, 0x26, 0xa3, 0x1a, 0x1e, 0x22, 0xf7, 0x17, 0x8a, 0xb5,
+		    0x59, 0xd8, 0x2b, 0x13, 0xdd, 0x12, 0x4e},
+	/* User Plane w/ZUC enc. UL for 18-bit SN*/
+	(uint8_t[]){0x0C, 0x00, 0x01, 0x32, 0xF9, 0x21, 0x1D, 0xBB, 0xF8, 0xE5, 0x7C,
+		0x74, 0xC2, 0xD7, 0xFF, 0x74, 0x59, 0x3A, 0x69, 0xD1, 0x8B, 0x65, 0x98,
+		0xB9, 0x3C, 0xFB, 0x63, 0xB1, 0x9E, 0xB7, 0xCA, 0x04, 0x68, 0xB9, 0xAB,
+		0xA2, 0x5A, 0xAF, 0x15, 0x8E, 0x71, 0xED, 0xE4, 0xFA, 0x99, 0x79, 0xF9,
+		0x51, 0x54, 0x82, 0x69, 0x4C, 0x45, 0x0B, 0xFA, 0x87, 0x4D, 0x97, 0x6E,
+		0xB0, 0xC9, 0x06, 0x08, 0x6B, 0xFC, 0x4A, 0x85, 0x43, 0x62, 0x73, 0xD8},
+	/* User Plane w/ZUC enc. DL for 18-bit SN*/
+	(uint8_t[]){0xF8, 0x00, 0x00, 0x30, 0x62, 0x48, 0xC0, 0xB1, 0xED, 0x1F, 0x13,
+		0x8A, 0x7A, 0x62, 0x40, 0x12, 0x35, 0x54, 0x03, 0x93, 0xBD, 0xE5, 0x88,
+		0x51, 0x38, 0xB5, 0x89, 0xC6, 0xD3, 0xB5, 0x44, 0xC2, 0xB9, 0xB9, 0x59,
+		0x7C, 0xEC, 0x71, 0xD8, 0x42, 0x01, 0x03, 0x3C, 0x0E, 0xBB, 0x7B, 0xDD,
+		0x7D, 0x2D, 0xE0, 0x3C, 0xE3, 0x81, 0xAA, 0xEA, 0xCC, 0xD7, 0xFC, 0x46,
+		0x07, 0x7C, 0x8E, 0x8E, 0x0E, 0x99, 0xB8, 0x31, 0x65, 0x17, 0xF6, 0xE3},
+
 };
 
 #endif /* SECURITY_PDCP_TEST_VECTOR_H_ */