diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der
new file mode 100644
index 00000000000000..7803a7190a2d31
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der
new file mode 100644
index 00000000000000..38a4e6ac1e53b7
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem
new file mode 100644
index 00000000000000..81e05f0a7f029d
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzjCCAXSgAwIBAgIIRthLwKhF8DUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0zMTA2Mjgx
+NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATqOifKLkmYJMB3RLsY7IRXtFKPfcdE
+6aIAwpRdhWsVsjO0l8J3LJwC1yHWWUBAFEyQK9Mr2M8AOJKqNiDHvvo6o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUkFx9n9t7p+Hj
+TWGViPrG1yH7jREwHwYDVR0jBBgwFoAUMOBrRRehYWxjDv0z4ClLqmWiL64wCgYI
+KoZIzj0EAwIDSAAwRQIhAN5899Vst9WNbORgsCmpDWcB32Yvsz6stXooq/8tfNZ5
+AiBjKEAWFaNY3KmhdEMBIBokli8UDrCsQ0B4uA7op/Hjbw==
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der
new file mode 100644
index 00000000000000..17db5fcf7757de
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem
new file mode 100644
index 00000000000000..61bcbe41a42d73
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/dac-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFwY1xVBoky9uLjKW+QNOFIRDP5z1yGpGonkq9T/8JcnoAoGCCqGSM49
+AwEHoUQDQgAE6jonyi5JmCTAd0S7GOyEV7RSj33HROmiAMKUXYVrFbIztJfCdyyc
+Atch1llAQBRMkCvTK9jPADiSqjYgx776Og==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der
new file mode 100644
index 00000000000000..d611b41f376eea
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem
new file mode 100644
index 00000000000000..1af94cdddc32ae
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvjCCAWSgAwIBAgIITbjYRrllfyUwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
+MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABFt/2QNW0x1opUKEqw1AlNuLVdglb1gped3kne4o2Lcj+QGlNJJT92lfHLqJ
+8nNc4csQzdoM9ef39fyvRiEfjlejZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQw4GtFF6FhbGMO/TPgKUuqZaIvrjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiEA
+/9qgBvao0V6PIB6kxmgu80bOuv9Ze/E7ZmNw7/QqBbcCIENSTTJGdmRvXCubWSDo
+0kqhXWOQzUIK+tyiGojpm7GV
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der
new file mode 100644
index 00000000000000..9982c9c6df9119
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem
new file mode 100644
index 00000000000000..e86524bcec9776
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/pai-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIBfWWCzdV+7JxSvXlCxsJP+qtVS0S4eKwQOMpOHO3kcjoAoGCCqGSM49
+AwEHoUQDQgAEW3/ZA1bTHWilQoSrDUCU24tV2CVvWCl53eSd7ijYtyP5AaU0klP3
+aV8cuonyc1zhyxDN2gz15/f1/K9GIR+OVw==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json
new file mode 100644
index 00000000000000..64815d0e9a55d4
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json
@@ -0,0 +1,9 @@
+{
+    "description": "DAC Test Vector: Certificate validity period starts in the future",
+    "is_success_case": "false",
+    "dac_cert": "308201ce30820174a003020102020846d84bc0a845f035300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3331303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d03010703420004ea3a27ca2e499824c07744bb18ec8457b4528f7dc744e9a200c2945d856b15b233b497c2772c9c02d721d6594040144c902bd32bd8cf003892aa3620c7befa3aa360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414905c7d9fdb7ba7e1e34d619588fac6d721fb8d11301f0603551d2304183016801430e06b4517a1616c630efd33e0294baa65a22fae300a06082a8648ce3d0403020348003045022100de7cf7d56cb7d58d6ce460b029a90d6701df662fb33eacb57a28abff2d7cd67902206328401615a358dca9a1744301201a24962f140eb0ac434078b80ee8a7f1e36f",
+    "pai_cert": "308201be30820164a00302010202084db8d846b9657f25300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d030107034200045b7fd90356d31d68a54284ab0d4094db8b55d8256f582979dde49dee28d8b723f901a5349253f7695f1cba89f2735ce1cb10cdda0cf5e7f7f5fcaf46211f8e57a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041430e06b4517a1616c630efd33e0294baa65a22fae301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020348003045022100ffdaa006f6a8d15e8f201ea4c6682ef346cebaff597bf13b666370eff42a05b7022043524d324676646f5c2b9b5920e8d24aa15d6390cd420afadca21a88e99bb195",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022100922cd7b5dadac018efcb7529ec7b464014aa65955f9f6bedb274b2be5850538602204d75b379859d1b6b666bd5f9990b2cdde952bdc06fbfc15fbe297bdd1455b79e",
+    "dac_private_key": "5c18d71541a24cbdb8b8ca5be40d3852110cfe73d721a91a89e4abd4fff09727",
+    "dac_public_key": "04ea3a27ca2e499824c07744bb18ec8457b4528f7dc744e9a200c2945d856b15b233b497c2772c9c02d721d6594040144c902bd32bd8cf003892aa3620c7befa3a"
+}
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der
new file mode 100644
index 00000000000000..c6cc9f9ba51595
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der
new file mode 100644
index 00000000000000..9f942cf5eb3d06
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem
new file mode 100644
index 00000000000000..ab8fdec3ca9cd0
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzjCCAXSgAwIBAgIINGjVPWtZ1dYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx
+NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQU15UFVuguhvGdZobRrZZ+grBniEij
+oXF/euUu3fEEXljwpK82trkZcEJW3yQWi7DKhsYE7jK4CtteksBDINM1o2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUS76dzjsCK9Ol
+psqaCfLu7DxTgdgwHwYDVR0jBBgwFoAUAuubPzDHJ6jhlR4ZY2jOcqc4JTMwCgYI
+KoZIzj0EAwIDSAAwRQIhALVkejOXN6HUWz56eRNB7S0OatCqXpQpY8kFd3x3AZDL
+AiBjH9hxvmJGeXKA34/tm2UQgAPX97huZjUyAg0qVNhIhA==
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der
new file mode 100644
index 00000000000000..3ee6da7d9f48dc
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem
new file mode 100644
index 00000000000000..4024c4b5f0b799
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/dac-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFBUJNBC3tXdgaQ3v+GHxqTUa/38r940UzrRSJrsMLeioAoGCCqGSM49
+AwEHoUQDQgAEFNeVBVboLobxnWaG0a2WfoKwZ4hIo6Fxf3rlLt3xBF5Y8KSvNra5
+GXBCVt8kFouwyobGBO4yuArbXpLAQyDTNQ==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der
new file mode 100644
index 00000000000000..dea87a5d2a7ac5
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem
new file mode 100644
index 00000000000000..fc9dd322359eac
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvjCCAWSgAwIBAgIIM6/3FLb2b08wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
+MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABEjDRNICkoYIMqcl90afYvst0TYH/M0Z7/ig2xbedw+4MOBgCa6ItEJNZHHM
+5pNNQ7lYtUb5PY2bmHJ/wbg+Q52jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQC65s/MMcnqOGVHhljaM5ypzglMzAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNIADBFAiBx
+RqKMoAyIbzXnqAdBxcti2pAdHFCHj57eBrrUWk6PHAIhALCUlEh51jUwIkXQHtDZ
+Lk1FbenZA7UrrdU6DV+3nMD1
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der
new file mode 100644
index 00000000000000..89aa7d89dd4145
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem
new file mode 100644
index 00000000000000..7ea4f341a47b88
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/pai-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJQ7UBEg4WpJ+nqKylXLvvSfr/WvdGG2kFiSYVp0QmHooAoGCCqGSM49
+AwEHoUQDQgAESMNE0gKShggypyX3Rp9i+y3RNgf8zRnv+KDbFt53D7gw4GAJroi0
+Qk1kcczmk01DuVi1Rvk9jZuYcn/BuD5DnQ==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json
new file mode 100644
index 00000000000000..c6a599820ad504
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json
@@ -0,0 +1,9 @@
+{
+    "description": "DAC Test Vector: Certificate validity period starts in the past",
+    "is_success_case": "false",
+    "dac_cert": "308201ce30820174a00302010202083468d53d6b59d5d6300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000414d7950556e82e86f19d6686d1ad967e82b0678848a3a1717f7ae52eddf1045e58f0a4af36b6b919704256df24168bb0ca86c604ee32b80adb5e92c04320d335a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604144bbe9dce3b022bd3a5a6ca9a09f2eeec3c5381d8301f0603551d2304183016801402eb9b3f30c727a8e1951e196368ce72a7382533300a06082a8648ce3d0403020348003045022100b5647a339737a1d45b3e7a791341ed2d0e6ad0aa5e942963c905777c770190cb0220631fd871be6246797280df8fed9b65108003d7f7b86e663532020d2a54d84884",
+    "pai_cert": "308201be30820164a003020102020833aff714b6f66f4f300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000448c344d20292860832a725f7469f62fb2dd13607fccd19eff8a0db16de770fb830e06009ae88b4424d6471cce6934d43b958b546f93d8d9b98727fc1b83e439da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e0416041402eb9b3f30c727a8e1951e196368ce72a7382533301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034800304502207146a28ca00c886f35e7a80741c5cb62da901d1c50878f9ede06bad45a4e8f1c022100b094944879d635302245d01ed0d92e4d456de9d903b52badd53a0d5fb79cc0f5",
+    "certification_declaration": "3081ea06092a864886f70d010702a081dc3081d9020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317e307c020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204483046022100cb29c572c7b6866da5d38c8dae26156660435978b51e16ca25a249426078f97e022100e083d7c69f32d8f18c1ad5f09dab0e7f12d59f16921040375c20e6455741aa7c",
+    "dac_private_key": "505424d042ded5dd81a437bfe187c6a4d46bfdfcafde34533ad1489aec30b7a2",
+    "dac_public_key": "0414d7950556e82e86f19d6686d1ad967e82b0678848a3a1717f7ae52eddf1045e58f0a4af36b6b919704256df24168bb0ca86c604ee32b80adb5e92c04320d335"
+}
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der
new file mode 100644
index 00000000000000..f6e033a3c9c8ea
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der
new file mode 100644
index 00000000000000..daae9bc57d9c28
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem
new file mode 100644
index 00000000000000..5374feea9d99aa
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzjCCAXSgAwIBAgIINUXeObnulDYwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
+MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARC2bKsgzrrD4NfrMC/cy1NR64fLDkn
+AbGgAZ04c3j8kTM5JpNzJizLCoIfQEsrvzT/cKM05WrCUD1tpvSRT2Gjo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUBXTgpJcmW04c
+ADb7T2869dJ0BogwHwYDVR0jBBgwFoAUVgxxvkgr/bx4gspWRGmZNkP/PJUwCgYI
+KoZIzj0EAwIDSAAwRQIgG8SmsG70/+AmfLac3pJCeWTj9HOQKi2HzAmACQK6JyoC
+IQCnCKT688LV0mmSpZLid0KYl192il4v74IW89HL7qLZ9Q==
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der
new file mode 100644
index 00000000000000..ea4dcf248ed022
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem
new file mode 100644
index 00000000000000..103036b3452d36
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/dac-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEID3cVEubgyJnOckFJtVwy9jdAMjrzK59SeK8Z5QW0n6voAoGCCqGSM49
+AwEHoUQDQgAEQtmyrIM66w+DX6zAv3MtTUeuHyw5JwGxoAGdOHN4/JEzOSaTcyYs
+ywqCH0BLK780/3CjNOVqwlA9bab0kU9how==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der
new file mode 100644
index 00000000000000..b0a95223737df6
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem
new file mode 100644
index 00000000000000..8a9d68b91280ab
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvzCCAWSgAwIBAgIIIAWHpDSRw+wwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0zMTA2Mjgx
+NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABCblK8SbyesXS0P8r+hJyv7+8wLEDQUFn919zJaKZLtN3wMPJhvfoK/ixGjx
+hYxs+KXP1y9342aJV6ZsZYaFh9WjZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRWDHG+SCv9vHiCylZEaZk2Q/88lTAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNJADBGAiEA
+kqG/Pfim+54OYW7ODwhPSs5xlnlPFXV1xtruaq8qkMMCIQDR0tRNp4I/+ohgyok0
+mKqVzIu87Wo8AwXgoHki1LR9Cg==
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der
new file mode 100644
index 00000000000000..63ff4e13760dcc
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem
new file mode 100644
index 00000000000000..a96a6024cd14a7
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/pai-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIH7wht0SaCGVV+tkUGcCoTWe79NzAYQIK1NVUase0QG2oAoGCCqGSM49
+AwEHoUQDQgAEJuUrxJvJ6xdLQ/yv6EnK/v7zAsQNBQWf3X3Mlopku03fAw8mG9+g
+r+LEaPGFjGz4pc/XL3fjZolXpmxlhoWH1Q==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json
new file mode 100644
index 00000000000000..5115b95a9ff111
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json
@@ -0,0 +1,9 @@
+{
+    "description": "PAI Test Vector: Certificate validity period starts in the future",
+    "is_success_case": "false",
+    "dac_cert": "308201ce30820174a00302010202083545de39b9ee9436300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000442d9b2ac833aeb0f835facc0bf732d4d47ae1f2c392701b1a0019d387378fc913339269373262ccb0a821f404b2bbf34ff70a334e56ac2503d6da6f4914f61a3a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e041604140574e0a497265b4e1c0036fb4f6f3af5d2740688301f0603551d23041830168014560c71be482bfdbc7882ca564469993643ff3c95300a06082a8648ce3d040302034800304502201bc4a6b06ef4ffe0267cb69cde92427964e3f473902a2d87cc09800902ba272a022100a708a4faf3c2d5d26992a592e2774298975f768a5e2fef8216f3d1cbeea2d9f5",
+    "pai_cert": "308201bf30820164a0030201020208200587a43491c3ec300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3331303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000426e52bc49bc9eb174b43fcafe849cafefef302c40d05059fdd7dcc968a64bb4ddf030f261bdfa0afe2c468f1858c6cf8a5cfd72f77e3668957a66c65868587d5a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414560c71be482bfdbc7882ca564469993643ff3c95301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034900304602210092a1bf3df8a6fb9e0e616ece0f084f4ace7196794f157575c6daee6aaf2a90c3022100d1d2d44da7823ffa8860ca893498aa95cc8bbced6a3c0305e0a07922d4b47d0a",
+    "certification_declaration": "3081e806092a864886f70d010702a081da3081d7020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317c307a020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204463044022040c1ccd18748a33c8a1a4085c1860f5578c91a926f3ff6f7fddf7d9c8d7226d1022051cedb3515d9130927802192e75a1fa212b960401674b443ee9e9bab4bbe6a87",
+    "dac_private_key": "3ddc544b9b83226739c90526d570cbd8dd00c8ebccae7d49e2bc679416d27eaf",
+    "dac_public_key": "0442d9b2ac833aeb0f835facc0bf732d4d47ae1f2c392701b1a0019d387378fc913339269373262ccb0a821f404b2bbf34ff70a334e56ac2503d6da6f4914f61a3"
+}
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der
new file mode 100644
index 00000000000000..cb6555be037cc5
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/cd.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der
new file mode 100644
index 00000000000000..c178c6aee01b92
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem
new file mode 100644
index 00000000000000..9861fbe051d653
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBzTCCAXSgAwIBAgIIAzh3GKRPeSIwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjA4MjIw
+MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowRjEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+REFDMRQwEgYKKwYBBAGConwCAQwERkZGMTEUMBIGCisGAQQBgqJ8AgIMBDgwMDAw
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASGNhiEzu1Nm2NPYt0qHFiDitHMuQXM
+NW8Tqb4BSqBefVoSdB7pMMPKsFiltjkkst0GPOVYfnVCDc8T1rHLYhjRo2AwXjAM
+BgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQU5j2AINpYLELe
+iWoKio8yNPwar/QwHwYDVR0jBBgwFoAUnlDkAxmNkJ5WoKbiieGY5914qrYwCgYI
+KoZIzj0EAwIDRwAwRAIgDqpLJJdwnIWrj/7GeYsovkrrkd1J1nDrscBp7nGsnKgC
+IDbq6Z0hqWMkXPGfvLq4yB/3ImWNOytbsDOF9+YoUT9y
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der
new file mode 100644
index 00000000000000..384108f7d00186
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem
new file mode 100644
index 00000000000000..cb0dddc49c22fc
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/dac-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOkpVGVymlFSxwTrHLW9jPJEdNDVRCk7OeI7OgHMsaC4oAoGCCqGSM49
+AwEHoUQDQgAEhjYYhM7tTZtjT2LdKhxYg4rRzLkFzDVvE6m+AUqgXn1aEnQe6TDD
+yrBYpbY5JLLdBjzlWH51Qg3PE9axy2IY0Q==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der
new file mode 100644
index 00000000000000..5b9d48a00c0798
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem
new file mode 100644
index 00000000000000..89a646b39013c3
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Cert.pem
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBvTCCAWSgAwIBAgIIWxl2V64Pys8wCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMTA2Mjgx
+NDIzNDNaGA85OTk5MTIzMTIzNTk1OVowMDEYMBYGA1UEAwwPTWF0dGVyIFRlc3Qg
+UEFJMRQwEgYKKwYBBAGConwCAQwERkZGMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+A0IABLE8m7IlP/47B8ve/nBbLuI89Q8Sh54oENkAN+J+4hOkZ/Aq50Uh8/aOK6Zu
+WF8PMrd5z474vPlsT0cXVTgUpK6jZjBkMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSeUOQDGY2QnlagpuKJ4Zjn3XiqtjAfBgNV
+HSMEGDAWgBRq/SJ3H1Ef7L8WQZdnENzcMaFxfjAKBggqhkjOPQQDAgNHADBEAiAY
+S1vVbraCM62P6PczOuGdZVgKdv4IOP6RfU+T7lpcCgIgfRuTnP2JVuD/JQApmy2p
+F7ZAgXXl/jv4hWjTO59L/Tg=
+-----END CERTIFICATE-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der
new file mode 100644
index 00000000000000..b08d04fe680fb7
Binary files /dev/null and b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.der differ
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem
new file mode 100644
index 00000000000000..3505a1d3b7471c
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/pai-Key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEII6tJ++vRDrh8n6WL7RJysPA8x/kugv8UpHU7swwmU9joAoGCCqGSM49
+AwEHoUQDQgAEsTybsiU//jsHy97+cFsu4jz1DxKHnigQ2QA34n7iE6Rn8CrnRSHz
+9o4rpm5YXw8yt3nPjvi8+WxPRxdVOBSkrg==
+-----END EC PRIVATE KEY-----
diff --git a/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json
new file mode 100644
index 00000000000000..4d6edf368d6c88
--- /dev/null
+++ b/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json
@@ -0,0 +1,9 @@
+{
+    "description": "PAI Test Vector: Certificate validity period starts in the past",
+    "is_success_case": "false",
+    "dac_cert": "308201cd30820174a003020102020803387718a44f7922300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303832323030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000486361884ceed4d9b634f62dd2a1c58838ad1ccb905cc356f13a9be014aa05e7d5a12741ee930c3cab058a5b63924b2dd063ce5587e75420dcf13d6b1cb6218d1a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414e63d8020da582c42de896a0a8a8f3234fc1aaff4301f0603551d230418301680149e50e403198d909e56a0a6e289e198e7dd78aab6300a06082a8648ce3d040302034700304402200eaa4b2497709c85ab8ffec6798b28be4aeb91dd49d670ebb1c069ee71ac9ca8022036eae99d21a963245cf19fbcbab8c81ff722658d3b2b5bb03385f7e628513f72",
+    "pai_cert": "308201bd30820164a00302010202085b197657ae0fcacf300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3231303632383134323334335a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004b13c9bb2253ffe3b07cbdefe705b2ee23cf50f12879e2810d90037e27ee213a467f02ae74521f3f68e2ba66e585f0f32b779cf8ef8bcf96c4f4717553814a4aea366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e041604149e50e403198d909e56a0a6e289e198e7dd78aab6301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d04030203470030440220184b5bd56eb68233ad8fe8f7333ae19d65580a76fe0838fe917d4f93ee5a5c0a02207d1b939cfd8956e0ff2500299b2da917b6408175e5fe3bf88568d33b9f4bfd38",
+    "certification_declaration": "3081e906092a864886f70d010702a081db3081d8020103310d300b0609608648016503040201304506092a864886f70d010701a0380436152400012501f1ff360205008018250334122c04135a494732303134315a423333303030312d32342405002406002507769824080018317d307b020103801462fa823359acfaa9963e1cfa140addf504f37160300b0609608648016503040201300a06082a8648ce3d04030204473045022065588a5c17483f8509ab39305d5aea5f23b626a756d6e70a7d484e18aef8f2a5022100b2cad7017e7b3d4df69746347ec04b16e0adadbe38eaaa0f849b74cbd53074f6",
+    "dac_private_key": "e9295465729a5152c704eb1cb5bd8cf24474d0d544293b39e23b3a01ccb1a0b8",
+    "dac_public_key": "0486361884ceed4d9b634f62dd2a1c58838ad1ccb905cc356f13a9be014aa05e7d5a12741ee930c3cab058a5b63924b2dd063ce5587e75420dcf13d6b1cb6218d1"
+}
diff --git a/src/tools/chip-cert/gen_com_dut_test_vectors.py b/src/tools/chip-cert/gen_com_dut_test_vectors.py
index 8a675f73948337..fa83d0064d5fb5 100755
--- a/src/tools/chip-cert/gen_com_dut_test_vectors.py
+++ b/src/tools/chip-cert/gen_com_dut_test_vectors.py
@@ -15,6 +15,9 @@
 VID_NOT_PRESENT = 0xFFFF
 PID_NOT_PRESENT = 0x0000
 
+VALID_IN_PAST = "2021-06-28 14:23:43"
+VALID_IN_FUTURE = "2031-06-28 14:23:43"
+
 
 class CertType(Enum):
     PAA = 1
@@ -71,6 +74,18 @@ class CertType(Enum):
         "error_flag": 'sig-curve',
         "is_success_case": 'false',
     },
+    {
+        "description": "Certificate validity period starts in the past",
+        "test_folder": 'valid_in_past',
+        "error_flag": 'no-error',
+        "is_success_case": 'false',
+    },
+    {
+        "description": "Certificate validity period starts in the future",
+        "test_folder": 'valid_in_future',
+        "error_flag": 'no-error',
+        "is_success_case": 'false',
+    },
     # TODO Cases:
     # 'issuer-vid'
     # 'issuer-pid'
@@ -647,13 +662,14 @@ def __init__(self, cert_type: CertType, paa_path, test_case_out_dir):
 
 
 class DevCertBuilder:
-    def __init__(self, cert_type: CertType, error_type: str, paa_path: str, test_case_out_dir: str, chip_cert: str, vid: int, pid: int, custom_cn_attribute: str):
+    def __init__(self, cert_type: CertType, error_type: str, paa_path: str, test_case_out_dir: str, chip_cert: str, vid: int, pid: int, custom_cn_attribute: str, valid_from: str):
         self.vid = vid
         self.pid = pid
         self.cert_type = cert_type
         self.error_type = error_type
         self.chipcert = chip_cert
         self.custom_cn_attribute = custom_cn_attribute
+        self.valid_from = valid_from
 
         if not os.path.exists(self.chipcert):
             raise Exception('Path not found: %s' % self.chipcert)
@@ -677,6 +693,10 @@ def make_certs_and_keys(self) -> None:
         subject_name = self.custom_cn_attribute
         vid_flag = ' -V 0x{:X}'.format(self.vid)
         pid_flag = ' -P 0x{:X}'.format(self.pid)
+        if (len(self.valid_from) == 0):
+            valid_from_flag = ''
+        else:
+            valid_from_flag = ' -f "' + self.valid_from + '"'
 
         if self.cert_type == CertType.PAI:
             if (len(subject_name) == 0):
@@ -690,7 +710,7 @@ def make_certs_and_keys(self) -> None:
             return
 
         cmd = self.chipcert + ' gen-att-cert ' + type_flag + error_type_flag + ' -c "' + subject_name + '" -C ' + self.signer.cert_pem + ' -K ' + \
-            self.signer.key_pem + vid_flag + pid_flag + ' -l 4294967295 -o ' + self.own.cert_pem + ' -O ' + self.own.key_pem
+            self.signer.key_pem + vid_flag + pid_flag + valid_from_flag + ' -l 4294967295 -o ' + self.own.cert_pem + ' -O ' + self.own.key_pem
         subprocess.run(cmd, shell=True)
         cmd = 'openssl x509 -inform pem -in ' + self.own.cert_pem + \
             ' -out ' + self.own.cert_der + ' -outform DER'
@@ -787,22 +807,34 @@ def main():
     for test_cert in ['dac', 'pai']:
         for test_case in CERT_STRUCT_TEST_CASES:
             test_case_out_dir = args.outdir + '/struct_' + test_cert + '_' + test_case["test_folder"]
+
+            if test_case["test_folder"] == 'valid_in_past':
+                valid_from = VALID_IN_PAST
+            elif test_case["test_folder"] == 'valid_in_future':
+                valid_from = VALID_IN_FUTURE
+            else:
+                valid_from = ''
+
             if test_cert == 'dac':
                 error_type_dac = test_case["error_flag"]
                 error_type_pai = 'no-error'
+                dac_valid_from = valid_from
+                pai_valid_from = ''
             else:
                 if test_case["error_flag"] == 'ext-skid-missing':
                     error_type_dac = 'ext-akid-missing'
                 else:
                     error_type_dac = 'no-error'
                 error_type_pai = test_case["error_flag"]
+                dac_valid_from = ''
+                pai_valid_from = valid_from
 
             vid = 0xFFF1
             pid = 0x8000
 
             # Generate PAI Cert/Key
             builder = DevCertBuilder(CertType.PAI, error_type_pai, args.paapath, test_case_out_dir,
-                                     chipcert, vid, PID_NOT_PRESENT, '')
+                                     chipcert, vid, PID_NOT_PRESENT, '', pai_valid_from)
             builder.make_certs_and_keys()
 
             if test_cert == 'pai':
@@ -813,7 +845,7 @@ def main():
 
             # Generate DAC Cert/Key
             builder = DevCertBuilder(CertType.DAC, error_type_dac, args.paapath, test_case_out_dir,
-                                     chipcert, vid, pid, '')
+                                     chipcert, vid, pid, '', dac_valid_from)
             builder.make_certs_and_keys()
 
             # Generate Certification Declaration (CD)
@@ -859,12 +891,12 @@ def main():
 
             # Generate PAI Cert/Key
             builder = DevCertBuilder(CertType.PAI, 'no-error', args.paapath, test_case_out_dir,
-                                     chipcert, vid_pai, pid_pai, common_name_pai)
+                                     chipcert, vid_pai, pid_pai, common_name_pai, '')
             builder.make_certs_and_keys()
 
             # Generate DAC Cert/Key
             builder = DevCertBuilder(CertType.DAC, 'no-error', args.paapath, test_case_out_dir,
-                                     chipcert, vid_dac, pid_dac, common_name_dac)
+                                     chipcert, vid_dac, pid_dac, common_name_dac, '')
             builder.make_certs_and_keys()
 
             # Generate Certification Declaration (CD)
@@ -882,12 +914,12 @@ def main():
 
         # Generate PAI Cert/Key
         builder = DevCertBuilder(CertType.PAI, 'no-error', args.paapath, test_case_out_dir,
-                                 chipcert, vid, pid, '')
+                                 chipcert, vid, pid, '', '')
         builder.make_certs_and_keys()
 
         # Generate DAC Cert/Key
         builder = DevCertBuilder(CertType.DAC, 'no-error', args.paapath, test_case_out_dir,
-                                 chipcert, vid, pid, '')
+                                 chipcert, vid, pid, '', '')
         builder.make_certs_and_keys()
 
         # Generate Certification Declaration (CD)