diff --git a/pki/testdata/nist-pkits/BUILD.gn b/pki/testdata/nist-pkits/BUILD.gn
deleted file mode 100644
index c64c7dd..0000000
--- a/pki/testdata/nist-pkits/BUILD.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2016 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-if (is_ios) {
-  import("//build/config/ios/bundle_data_from_filelist.gni")
-
-  bundle_data_from_filelist("test_bundle_data") {
-    testonly = true
-    filelist_name = "test_bundle_data.filelist"
-  }
-}
-
-# Depend on this to get the data deps necessary to run the PKITS tests in the
-# test environment.
-group("nist-pkits") {
-  data = [
-    "certs/",
-    "crls/",
-  ]
-}
diff --git a/pki/testdata/nist-pkits/test_bundle_data.filelist b/pki/testdata/nist-pkits/test_bundle_data.filelist
deleted file mode 100644
index a4aea26..0000000
--- a/pki/testdata/nist-pkits/test_bundle_data.filelist
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 2023 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# NOTE: this file is generated by build/ios/update_bundle_filelist.py
-#       If it requires updating, you should get a presubmit error with
-#       instructions on how to regenerate. Otherwise, do not edit.
-certs/AllCertificatesNoPoliciesTest2EE.crt
-certs/AllCertificatesSamePoliciesTest10EE.crt
-certs/AllCertificatesSamePoliciesTest13EE.crt
-certs/AllCertificatesanyPolicyTest11EE.crt
-certs/AnyPolicyTest14EE.crt
-certs/BadCRLIssuerNameCACert.crt
-certs/BadCRLSignatureCACert.crt
-certs/BadSignedCACert.crt
-certs/BadnotAfterDateCACert.crt
-certs/BadnotBeforeDateCACert.crt
-certs/BasicSelfIssuedCRLSigningKeyCACert.crt
-certs/BasicSelfIssuedCRLSigningKeyCRLCert.crt
-certs/BasicSelfIssuedNewKeyCACert.crt
-certs/BasicSelfIssuedNewKeyOldWithNewCACert.crt
-certs/BasicSelfIssuedOldKeyCACert.crt
-certs/BasicSelfIssuedOldKeyNewWithOldCACert.crt
-certs/CPSPointerQualifierTest20EE.crt
-certs/DSACACert.crt
-certs/DSAParametersInheritedCACert.crt
-certs/DifferentPoliciesTest12EE.crt
-certs/DifferentPoliciesTest3EE.crt
-certs/DifferentPoliciesTest4EE.crt
-certs/DifferentPoliciesTest5EE.crt
-certs/DifferentPoliciesTest7EE.crt
-certs/DifferentPoliciesTest8EE.crt
-certs/DifferentPoliciesTest9EE.crt
-certs/GeneralizedTimeCRLnextUpdateCACert.crt
-certs/GoodCACert.crt
-certs/GoodsubCACert.crt
-certs/GoodsubCAPanyPolicyMapping1to2CACert.crt
-certs/InvalidBadCRLIssuerNameTest5EE.crt
-certs/InvalidBadCRLSignatureTest4EE.crt
-certs/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.crt
-certs/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.crt
-certs/InvalidBasicSelfIssuedNewWithOldTest5EE.crt
-certs/InvalidBasicSelfIssuedOldWithNewTest2EE.crt
-certs/InvalidCASignatureTest2EE.crt
-certs/InvalidCAnotAfterDateTest5EE.crt
-certs/InvalidCAnotBeforeDateTest1EE.crt
-certs/InvalidDNSnameConstraintsTest31EE.crt
-certs/InvalidDNSnameConstraintsTest33EE.crt
-certs/InvalidDNSnameConstraintsTest38EE.crt
-certs/InvalidDNandRFC822nameConstraintsTest28EE.crt
-certs/InvalidDNandRFC822nameConstraintsTest29EE.crt
-certs/InvalidDNnameConstraintsTest10EE.crt
-certs/InvalidDNnameConstraintsTest12EE.crt
-certs/InvalidDNnameConstraintsTest13EE.crt
-certs/InvalidDNnameConstraintsTest15EE.crt
-certs/InvalidDNnameConstraintsTest16EE.crt
-certs/InvalidDNnameConstraintsTest17EE.crt
-certs/InvalidDNnameConstraintsTest20EE.crt
-certs/InvalidDNnameConstraintsTest2EE.crt
-certs/InvalidDNnameConstraintsTest3EE.crt
-certs/InvalidDNnameConstraintsTest7EE.crt
-certs/InvalidDNnameConstraintsTest8EE.crt
-certs/InvalidDNnameConstraintsTest9EE.crt
-certs/InvalidDSASignatureTest6EE.crt
-certs/InvalidEESignatureTest3EE.crt
-certs/InvalidEEnotAfterDateTest6EE.crt
-certs/InvalidEEnotBeforeDateTest2EE.crt
-certs/InvalidIDPwithindirectCRLTest23EE.crt
-certs/InvalidIDPwithindirectCRLTest26EE.crt
-certs/InvalidLongSerialNumberTest18EE.crt
-certs/InvalidMappingFromanyPolicyTest7EE.crt
-certs/InvalidMappingToanyPolicyTest8EE.crt
-certs/InvalidMissingCRLTest1EE.crt
-certs/InvalidMissingbasicConstraintsTest1EE.crt
-certs/InvalidNameChainingOrderTest2EE.crt
-certs/InvalidNameChainingTest1EE.crt
-certs/InvalidNegativeSerialNumberTest15EE.crt
-certs/InvalidOldCRLnextUpdateTest11EE.crt
-certs/InvalidPolicyMappingTest10EE.crt
-certs/InvalidPolicyMappingTest2EE.crt
-certs/InvalidPolicyMappingTest4EE.crt
-certs/InvalidRFC822nameConstraintsTest22EE.crt
-certs/InvalidRFC822nameConstraintsTest24EE.crt
-certs/InvalidRFC822nameConstraintsTest26EE.crt
-certs/InvalidRevokedCATest2EE.crt
-certs/InvalidRevokedEETest3EE.crt
-certs/InvalidSelfIssuedinhibitAnyPolicyTest10EE.crt
-certs/InvalidSelfIssuedinhibitAnyPolicyTest8EE.crt
-certs/InvalidSelfIssuedinhibitPolicyMappingTest10EE.crt
-certs/InvalidSelfIssuedinhibitPolicyMappingTest11EE.crt
-certs/InvalidSelfIssuedinhibitPolicyMappingTest8EE.crt
-certs/InvalidSelfIssuedinhibitPolicyMappingTest9EE.crt
-certs/InvalidSelfIssuedpathLenConstraintTest16EE.crt
-certs/InvalidSelfIssuedrequireExplicitPolicyTest7EE.crt
-certs/InvalidSelfIssuedrequireExplicitPolicyTest8EE.crt
-certs/InvalidSeparateCertificateandCRLKeysTest20EE.crt
-certs/InvalidSeparateCertificateandCRLKeysTest21EE.crt
-certs/InvalidURInameConstraintsTest35EE.crt
-certs/InvalidURInameConstraintsTest37EE.crt
-certs/InvalidUnknownCRLEntryExtensionTest8EE.crt
-certs/InvalidUnknownCRLExtensionTest10EE.crt
-certs/InvalidUnknownCRLExtensionTest9EE.crt
-certs/InvalidUnknownCriticalCertificateExtensionTest2EE.crt
-certs/InvalidWrongCRLTest6EE.crt
-certs/InvalidcAFalseTest2EE.crt
-certs/InvalidcAFalseTest3EE.crt
-certs/InvalidcRLIssuerTest27EE.crt
-certs/InvalidcRLIssuerTest31EE.crt
-certs/InvalidcRLIssuerTest32EE.crt
-certs/InvalidcRLIssuerTest34EE.crt
-certs/InvalidcRLIssuerTest35EE.crt
-certs/InvaliddeltaCRLIndicatorNoBaseTest1EE.crt
-certs/InvaliddeltaCRLTest10EE.crt
-certs/InvaliddeltaCRLTest3EE.crt
-certs/InvaliddeltaCRLTest4EE.crt
-certs/InvaliddeltaCRLTest6EE.crt
-certs/InvaliddeltaCRLTest9EE.crt
-certs/InvaliddistributionPointTest2EE.crt
-certs/InvaliddistributionPointTest3EE.crt
-certs/InvaliddistributionPointTest6EE.crt
-certs/InvaliddistributionPointTest8EE.crt
-certs/InvaliddistributionPointTest9EE.crt
-certs/InvalidinhibitAnyPolicyTest1EE.crt
-certs/InvalidinhibitAnyPolicyTest4EE.crt
-certs/InvalidinhibitAnyPolicyTest5EE.crt
-certs/InvalidinhibitAnyPolicyTest6EE.crt
-certs/InvalidinhibitPolicyMappingTest1EE.crt
-certs/InvalidinhibitPolicyMappingTest3EE.crt
-certs/InvalidinhibitPolicyMappingTest5EE.crt
-certs/InvalidinhibitPolicyMappingTest6EE.crt
-certs/InvalidkeyUsageCriticalcRLSignFalseTest4EE.crt
-certs/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.crt
-certs/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.crt
-certs/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.crt
-certs/InvalidonlyContainsAttributeCertsTest14EE.crt
-certs/InvalidonlyContainsCACertsTest12EE.crt
-certs/InvalidonlyContainsUserCertsTest11EE.crt
-certs/InvalidonlySomeReasonsTest15EE.crt
-certs/InvalidonlySomeReasonsTest16EE.crt
-certs/InvalidonlySomeReasonsTest17EE.crt
-certs/InvalidonlySomeReasonsTest20EE.crt
-certs/InvalidonlySomeReasonsTest21EE.crt
-certs/InvalidpathLenConstraintTest10EE.crt
-certs/InvalidpathLenConstraintTest11EE.crt
-certs/InvalidpathLenConstraintTest12EE.crt
-certs/InvalidpathLenConstraintTest5EE.crt
-certs/InvalidpathLenConstraintTest6EE.crt
-certs/InvalidpathLenConstraintTest9EE.crt
-certs/Invalidpre2000CRLnextUpdateTest12EE.crt
-certs/Invalidpre2000UTCEEnotAfterDateTest7EE.crt
-certs/InvalidrequireExplicitPolicyTest3EE.crt
-certs/InvalidrequireExplicitPolicyTest5EE.crt
-certs/LongSerialNumberCACert.crt
-certs/Mapping1to2CACert.crt
-certs/MappingFromanyPolicyCACert.crt
-certs/MappingToanyPolicyCACert.crt
-certs/MissingbasicConstraintsCACert.crt
-certs/NameOrderingCACert.crt
-certs/NegativeSerialNumberCACert.crt
-certs/NoCRLCACert.crt
-certs/NoPoliciesCACert.crt
-certs/NoissuingDistributionPointCACert.crt
-certs/OldCRLnextUpdateCACert.crt
-certs/OverlappingPoliciesTest6EE.crt
-certs/P12Mapping1to3CACert.crt
-certs/P12Mapping1to3subCACert.crt
-certs/P12Mapping1to3subsubCACert.crt
-certs/P1Mapping1to234CACert.crt
-certs/P1Mapping1to234subCACert.crt
-certs/P1anyPolicyMapping1to2CACert.crt
-certs/PanyPolicyMapping1to2CACert.crt
-certs/PoliciesP1234CACert.crt
-certs/PoliciesP1234subCAP123Cert.crt
-certs/PoliciesP1234subsubCAP123P12Cert.crt
-certs/PoliciesP123CACert.crt
-certs/PoliciesP123subCAP12Cert.crt
-certs/PoliciesP123subsubCAP12P1Cert.crt
-certs/PoliciesP123subsubCAP12P2Cert.crt
-certs/PoliciesP123subsubsubCAP12P2P1Cert.crt
-certs/PoliciesP12CACert.crt
-certs/PoliciesP12subCAP1Cert.crt
-certs/PoliciesP12subsubCAP1P2Cert.crt
-certs/PoliciesP2subCA2Cert.crt
-certs/PoliciesP2subCACert.crt
-certs/PoliciesP3CACert.crt
-certs/RFC3280MandatoryAttributeTypesCACert.crt
-certs/RFC3280OptionalAttributeTypesCACert.crt
-certs/RevokedsubCACert.crt
-certs/RolloverfromPrintableStringtoUTF8StringCACert.crt
-certs/SeparateCertificateandCRLKeysCA2CRLSigningCert.crt
-certs/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.crt
-certs/SeparateCertificateandCRLKeysCRLSigningCert.crt
-certs/SeparateCertificateandCRLKeysCertificateSigningCACert.crt
-certs/TrustAnchorRootCertificate.crt
-certs/TwoCRLsCACert.crt
-certs/UIDCACert.crt
-certs/UTF8StringCaseInsensitiveMatchCACert.crt
-certs/UTF8StringEncodedNamesCACert.crt
-certs/UnknownCRLEntryExtensionCACert.crt
-certs/UnknownCRLExtensionCACert.crt
-certs/UserNoticeQualifierTest15EE.crt
-certs/UserNoticeQualifierTest16EE.crt
-certs/UserNoticeQualifierTest17EE.crt
-certs/UserNoticeQualifierTest18EE.crt
-certs/UserNoticeQualifierTest19EE.crt
-certs/ValidBasicSelfIssuedCRLSigningKeyTest6EE.crt
-certs/ValidBasicSelfIssuedNewWithOldTest3EE.crt
-certs/ValidBasicSelfIssuedNewWithOldTest4EE.crt
-certs/ValidBasicSelfIssuedOldWithNewTest1EE.crt
-certs/ValidCertificatePathTest1EE.crt
-certs/ValidDNSnameConstraintsTest30EE.crt
-certs/ValidDNSnameConstraintsTest32EE.crt
-certs/ValidDNandRFC822nameConstraintsTest27EE.crt
-certs/ValidDNnameConstraintsTest11EE.crt
-certs/ValidDNnameConstraintsTest14EE.crt
-certs/ValidDNnameConstraintsTest18EE.crt
-certs/ValidDNnameConstraintsTest19EE.crt
-certs/ValidDNnameConstraintsTest1EE.crt
-certs/ValidDNnameConstraintsTest4EE.crt
-certs/ValidDNnameConstraintsTest5EE.crt
-certs/ValidDNnameConstraintsTest6EE.crt
-certs/ValidDSAParameterInheritanceTest5EE.crt
-certs/ValidDSASignaturesTest4EE.crt
-certs/ValidGeneralizedTimeCRLnextUpdateTest13EE.crt
-certs/ValidGeneralizedTimenotAfterDateTest8EE.crt
-certs/ValidGeneralizedTimenotBeforeDateTest4EE.crt
-certs/ValidIDPwithindirectCRLTest22EE.crt
-certs/ValidIDPwithindirectCRLTest24EE.crt
-certs/ValidIDPwithindirectCRLTest25EE.crt
-certs/ValidLongSerialNumberTest16EE.crt
-certs/ValidLongSerialNumberTest17EE.crt
-certs/ValidNameChainingCapitalizationTest5EE.crt
-certs/ValidNameChainingWhitespaceTest3EE.crt
-certs/ValidNameChainingWhitespaceTest4EE.crt
-certs/ValidNameUIDsTest6EE.crt
-certs/ValidNegativeSerialNumberTest14EE.crt
-certs/ValidNoissuingDistributionPointTest10EE.crt
-certs/ValidPolicyMappingTest11EE.crt
-certs/ValidPolicyMappingTest12EE.crt
-certs/ValidPolicyMappingTest13EE.crt
-certs/ValidPolicyMappingTest14EE.crt
-certs/ValidPolicyMappingTest1EE.crt
-certs/ValidPolicyMappingTest3EE.crt
-certs/ValidPolicyMappingTest5EE.crt
-certs/ValidPolicyMappingTest6EE.crt
-certs/ValidPolicyMappingTest9EE.crt
-certs/ValidRFC3280MandatoryAttributeTypesTest7EE.crt
-certs/ValidRFC3280OptionalAttributeTypesTest8EE.crt
-certs/ValidRFC822nameConstraintsTest21EE.crt
-certs/ValidRFC822nameConstraintsTest23EE.crt
-certs/ValidRFC822nameConstraintsTest25EE.crt
-certs/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt
-certs/ValidSelfIssuedinhibitAnyPolicyTest7EE.crt
-certs/ValidSelfIssuedinhibitAnyPolicyTest9EE.crt
-certs/ValidSelfIssuedinhibitPolicyMappingTest7EE.crt
-certs/ValidSelfIssuedpathLenConstraintTest15EE.crt
-certs/ValidSelfIssuedpathLenConstraintTest17EE.crt
-certs/ValidSelfIssuedrequireExplicitPolicyTest6EE.crt
-certs/ValidSeparateCertificateandCRLKeysTest19EE.crt
-certs/ValidTwoCRLsTest7EE.crt
-certs/ValidURInameConstraintsTest34EE.crt
-certs/ValidURInameConstraintsTest36EE.crt
-certs/ValidUTF8StringCaseInsensitiveMatchTest11EE.crt
-certs/ValidUTF8StringEncodedNamesTest9EE.crt
-certs/ValidUnknownNotCriticalCertificateExtensionTest1EE.crt
-certs/ValidbasicConstraintsNotCriticalTest4EE.crt
-certs/ValidcRLIssuerTest28EE.crt
-certs/ValidcRLIssuerTest29EE.crt
-certs/ValidcRLIssuerTest30EE.crt
-certs/ValidcRLIssuerTest33EE.crt
-certs/ValiddeltaCRLTest2EE.crt
-certs/ValiddeltaCRLTest5EE.crt
-certs/ValiddeltaCRLTest7EE.crt
-certs/ValiddeltaCRLTest8EE.crt
-certs/ValiddistributionPointTest1EE.crt
-certs/ValiddistributionPointTest4EE.crt
-certs/ValiddistributionPointTest5EE.crt
-certs/ValiddistributionPointTest7EE.crt
-certs/ValidinhibitAnyPolicyTest2EE.crt
-certs/ValidinhibitPolicyMappingTest2EE.crt
-certs/ValidinhibitPolicyMappingTest4EE.crt
-certs/ValidkeyUsageNotCriticalTest3EE.crt
-certs/ValidonlyContainsCACertsTest13EE.crt
-certs/ValidonlySomeReasonsTest18EE.crt
-certs/ValidonlySomeReasonsTest19EE.crt
-certs/ValidpathLenConstraintTest13EE.crt
-certs/ValidpathLenConstraintTest14EE.crt
-certs/ValidpathLenConstraintTest7EE.crt
-certs/ValidpathLenConstraintTest8EE.crt
-certs/Validpre2000UTCnotBeforeDateTest3EE.crt
-certs/ValidrequireExplicitPolicyTest1EE.crt
-certs/ValidrequireExplicitPolicyTest2EE.crt
-certs/ValidrequireExplicitPolicyTest4EE.crt
-certs/WrongCRLCACert.crt
-certs/anyPolicyCACert.crt
-certs/basicConstraintsCriticalcAFalseCACert.crt
-certs/basicConstraintsNotCriticalCACert.crt
-certs/basicConstraintsNotCriticalcAFalseCACert.crt
-certs/deltaCRLCA1Cert.crt
-certs/deltaCRLCA2Cert.crt
-certs/deltaCRLCA3Cert.crt
-certs/deltaCRLIndicatorNoBaseCACert.crt
-certs/distributionPoint1CACert.crt
-certs/distributionPoint2CACert.crt
-certs/indirectCRLCA1Cert.crt
-certs/indirectCRLCA2Cert.crt
-certs/indirectCRLCA3Cert.crt
-certs/indirectCRLCA3cRLIssuerCert.crt
-certs/indirectCRLCA4Cert.crt
-certs/indirectCRLCA4cRLIssuerCert.crt
-certs/indirectCRLCA5Cert.crt
-certs/indirectCRLCA6Cert.crt
-certs/inhibitAnyPolicy0CACert.crt
-certs/inhibitAnyPolicy1CACert.crt
-certs/inhibitAnyPolicy1SelfIssuedCACert.crt
-certs/inhibitAnyPolicy1SelfIssuedsubCA2Cert.crt
-certs/inhibitAnyPolicy1subCA1Cert.crt
-certs/inhibitAnyPolicy1subCA2Cert.crt
-certs/inhibitAnyPolicy1subCAIAP5Cert.crt
-certs/inhibitAnyPolicy1subsubCA2Cert.crt
-certs/inhibitAnyPolicy5CACert.crt
-certs/inhibitAnyPolicy5subCACert.crt
-certs/inhibitAnyPolicy5subsubCACert.crt
-certs/inhibitAnyPolicyTest3EE.crt
-certs/inhibitPolicyMapping0CACert.crt
-certs/inhibitPolicyMapping0subCACert.crt
-certs/inhibitPolicyMapping1P12CACert.crt
-certs/inhibitPolicyMapping1P12subCACert.crt
-certs/inhibitPolicyMapping1P12subCAIPM5Cert.crt
-certs/inhibitPolicyMapping1P12subsubCACert.crt
-certs/inhibitPolicyMapping1P12subsubCAIPM5Cert.crt
-certs/inhibitPolicyMapping1P1CACert.crt
-certs/inhibitPolicyMapping1P1SelfIssuedCACert.crt
-certs/inhibitPolicyMapping1P1SelfIssuedsubCACert.crt
-certs/inhibitPolicyMapping1P1subCACert.crt
-certs/inhibitPolicyMapping1P1subsubCACert.crt
-certs/inhibitPolicyMapping5CACert.crt
-certs/inhibitPolicyMapping5subCACert.crt
-certs/inhibitPolicyMapping5subsubCACert.crt
-certs/inhibitPolicyMapping5subsubsubCACert.crt
-certs/keyUsageCriticalcRLSignFalseCACert.crt
-certs/keyUsageCriticalkeyCertSignFalseCACert.crt
-certs/keyUsageNotCriticalCACert.crt
-certs/keyUsageNotCriticalcRLSignFalseCACert.crt
-certs/keyUsageNotCriticalkeyCertSignFalseCACert.crt
-certs/nameConstraintsDN1CACert.crt
-certs/nameConstraintsDN1SelfIssuedCACert.crt
-certs/nameConstraintsDN1subCA1Cert.crt
-certs/nameConstraintsDN1subCA2Cert.crt
-certs/nameConstraintsDN1subCA3Cert.crt
-certs/nameConstraintsDN2CACert.crt
-certs/nameConstraintsDN3CACert.crt
-certs/nameConstraintsDN3subCA1Cert.crt
-certs/nameConstraintsDN3subCA2Cert.crt
-certs/nameConstraintsDN4CACert.crt
-certs/nameConstraintsDN5CACert.crt
-certs/nameConstraintsDNS1CACert.crt
-certs/nameConstraintsDNS2CACert.crt
-certs/nameConstraintsRFC822CA1Cert.crt
-certs/nameConstraintsRFC822CA2Cert.crt
-certs/nameConstraintsRFC822CA3Cert.crt
-certs/nameConstraintsURI1CACert.crt
-certs/nameConstraintsURI2CACert.crt
-certs/onlyContainsAttributeCertsCACert.crt
-certs/onlyContainsCACertsCACert.crt
-certs/onlyContainsUserCertsCACert.crt
-certs/onlySomeReasonsCA1Cert.crt
-certs/onlySomeReasonsCA2Cert.crt
-certs/onlySomeReasonsCA3Cert.crt
-certs/onlySomeReasonsCA4Cert.crt
-certs/pathLenConstraint0CACert.crt
-certs/pathLenConstraint0SelfIssuedCACert.crt
-certs/pathLenConstraint0subCA2Cert.crt
-certs/pathLenConstraint0subCACert.crt
-certs/pathLenConstraint1CACert.crt
-certs/pathLenConstraint1SelfIssuedCACert.crt
-certs/pathLenConstraint1SelfIssuedsubCACert.crt
-certs/pathLenConstraint1subCACert.crt
-certs/pathLenConstraint6CACert.crt
-certs/pathLenConstraint6subCA0Cert.crt
-certs/pathLenConstraint6subCA1Cert.crt
-certs/pathLenConstraint6subCA4Cert.crt
-certs/pathLenConstraint6subsubCA00Cert.crt
-certs/pathLenConstraint6subsubCA11Cert.crt
-certs/pathLenConstraint6subsubCA41Cert.crt
-certs/pathLenConstraint6subsubsubCA11XCert.crt
-certs/pathLenConstraint6subsubsubCA41XCert.crt
-certs/pre2000CRLnextUpdateCACert.crt
-certs/requireExplicitPolicy0CACert.crt
-certs/requireExplicitPolicy0subCACert.crt
-certs/requireExplicitPolicy0subsubCACert.crt
-certs/requireExplicitPolicy0subsubsubCACert.crt
-certs/requireExplicitPolicy10CACert.crt
-certs/requireExplicitPolicy10subCACert.crt
-certs/requireExplicitPolicy10subsubCACert.crt
-certs/requireExplicitPolicy10subsubsubCACert.crt
-certs/requireExplicitPolicy2CACert.crt
-certs/requireExplicitPolicy2SelfIssuedCACert.crt
-certs/requireExplicitPolicy2SelfIssuedsubCACert.crt
-certs/requireExplicitPolicy2subCACert.crt
-certs/requireExplicitPolicy4CACert.crt
-certs/requireExplicitPolicy4subCACert.crt
-certs/requireExplicitPolicy4subsubCACert.crt
-certs/requireExplicitPolicy4subsubsubCACert.crt
-certs/requireExplicitPolicy5CACert.crt
-certs/requireExplicitPolicy5subCACert.crt
-certs/requireExplicitPolicy5subsubCACert.crt
-certs/requireExplicitPolicy5subsubsubCACert.crt
-certs/requireExplicitPolicy7CACert.crt
-certs/requireExplicitPolicy7subCARE2Cert.crt
-certs/requireExplicitPolicy7subsubCARE2RE4Cert.crt
-certs/requireExplicitPolicy7subsubsubCARE2RE4Cert.crt
-crls/BadCRLIssuerNameCACRL.crl
-crls/BadCRLSignatureCACRL.crl
-crls/BadSignedCACRL.crl
-crls/BadnotAfterDateCACRL.crl
-crls/BadnotBeforeDateCACRL.crl
-crls/BasicSelfIssuedCRLSigningKeyCACRL.crl
-crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.crl
-crls/BasicSelfIssuedNewKeyCACRL.crl
-crls/BasicSelfIssuedOldKeyCACRL.crl
-crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.crl
-crls/DSACACRL.crl
-crls/DSAParametersInheritedCACRL.crl
-crls/GeneralizedTimeCRLnextUpdateCACRL.crl
-crls/GoodCACRL.crl
-crls/GoodsubCACRL.crl
-crls/GoodsubCAPanyPolicyMapping1to2CACRL.crl
-crls/LongSerialNumberCACRL.crl
-crls/Mapping1to2CACRL.crl
-crls/MappingFromanyPolicyCACRL.crl
-crls/MappingToanyPolicyCACRL.crl
-crls/MissingbasicConstraintsCACRL.crl
-crls/NameOrderCACRL.crl
-crls/NegativeSerialNumberCACRL.crl
-crls/NoPoliciesCACRL.crl
-crls/NoissuingDistributionPointCACRL.crl
-crls/OldCRLnextUpdateCACRL.crl
-crls/P12Mapping1to3CACRL.crl
-crls/P12Mapping1to3subCACRL.crl
-crls/P12Mapping1to3subsubCACRL.crl
-crls/P1Mapping1to234CACRL.crl
-crls/P1Mapping1to234subCACRL.crl
-crls/P1anyPolicyMapping1to2CACRL.crl
-crls/PanyPolicyMapping1to2CACRL.crl
-crls/PoliciesP1234CACRL.crl
-crls/PoliciesP1234subCAP123CRL.crl
-crls/PoliciesP1234subsubCAP123P12CRL.crl
-crls/PoliciesP123CACRL.crl
-crls/PoliciesP123subCAP12CRL.crl
-crls/PoliciesP123subsubCAP12P1CRL.crl
-crls/PoliciesP123subsubCAP2P2CRL.crl
-crls/PoliciesP123subsubsubCAP12P2P1CRL.crl
-crls/PoliciesP12CACRL.crl
-crls/PoliciesP12subCAP1CRL.crl
-crls/PoliciesP12subsubCAP1P2CRL.crl
-crls/PoliciesP2subCA2CRL.crl
-crls/PoliciesP2subCACRL.crl
-crls/PoliciesP3CACRL.crl
-crls/RFC3280MandatoryAttributeTypesCACRL.crl
-crls/RFC3280OptionalAttributeTypesCACRL.crl
-crls/RevokedsubCACRL.crl
-crls/RolloverfromPrintableStringtoUTF8StringCACRL.crl
-crls/SeparateCertificateandCRLKeysCA2CRL.crl
-crls/SeparateCertificateandCRLKeysCRL.crl
-crls/TrustAnchorRootCRL.crl
-crls/TwoCRLsCABadCRL.crl
-crls/TwoCRLsCAGoodCRL.crl
-crls/UIDCACRL.crl
-crls/UTF8StringCaseInsensitiveMatchCACRL.crl
-crls/UTF8StringEncodedNamesCACRL.crl
-crls/UnknownCRLEntryExtensionCACRL.crl
-crls/UnknownCRLExtensionCACRL.crl
-crls/WrongCRLCACRL.crl
-crls/anyPolicyCACRL.crl
-crls/basicConstraintsCriticalcAFalseCACRL.crl
-crls/basicConstraintsNotCriticalCACRL.crl
-crls/basicConstraintsNotCriticalcAFalseCACRL.crl
-crls/deltaCRLCA1CRL.crl
-crls/deltaCRLCA1deltaCRL.crl
-crls/deltaCRLCA2CRL.crl
-crls/deltaCRLCA2deltaCRL.crl
-crls/deltaCRLCA3CRL.crl
-crls/deltaCRLCA3deltaCRL.crl
-crls/deltaCRLIndicatorNoBaseCACRL.crl
-crls/distributionPoint1CACRL.crl
-crls/distributionPoint2CACRL.crl
-crls/indirectCRLCA1CRL.crl
-crls/indirectCRLCA3CRL.crl
-crls/indirectCRLCA3cRLIssuerCRL.crl
-crls/indirectCRLCA4cRLIssuerCRL.crl
-crls/indirectCRLCA5CRL.crl
-crls/inhibitAnyPolicy0CACRL.crl
-crls/inhibitAnyPolicy1CACRL.crl
-crls/inhibitAnyPolicy1subCA1CRL.crl
-crls/inhibitAnyPolicy1subCA2CRL.crl
-crls/inhibitAnyPolicy1subCAIAP5CRL.crl
-crls/inhibitAnyPolicy1subsubCA2CRL.crl
-crls/inhibitAnyPolicy5CACRL.crl
-crls/inhibitAnyPolicy5subCACRL.crl
-crls/inhibitAnyPolicy5subsubCACRL.crl
-crls/inhibitPolicyMapping0CACRL.crl
-crls/inhibitPolicyMapping0subCACRL.crl
-crls/inhibitPolicyMapping1P12CACRL.crl
-crls/inhibitPolicyMapping1P12subCACRL.crl
-crls/inhibitPolicyMapping1P12subCAIPM5CRL.crl
-crls/inhibitPolicyMapping1P12subsubCACRL.crl
-crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.crl
-crls/inhibitPolicyMapping1P1CACRL.crl
-crls/inhibitPolicyMapping1P1subCACRL.crl
-crls/inhibitPolicyMapping1P1subsubCACRL.crl
-crls/inhibitPolicyMapping5CACRL.crl
-crls/inhibitPolicyMapping5subCACRL.crl
-crls/inhibitPolicyMapping5subsubCACRL.crl
-crls/inhibitPolicyMapping5subsubsubCACRL.crl
-crls/keyUsageCriticalcRLSignFalseCACRL.crl
-crls/keyUsageCriticalkeyCertSignFalseCACRL.crl
-crls/keyUsageNotCriticalCACRL.crl
-crls/keyUsageNotCriticalcRLSignFalseCACRL.crl
-crls/keyUsageNotCriticalkeyCertSignFalseCACRL.crl
-crls/nameConstraintsDN1CACRL.crl
-crls/nameConstraintsDN1subCA1CRL.crl
-crls/nameConstraintsDN1subCA2CRL.crl
-crls/nameConstraintsDN1subCA3CRL.crl
-crls/nameConstraintsDN2CACRL.crl
-crls/nameConstraintsDN3CACRL.crl
-crls/nameConstraintsDN3subCA1CRL.crl
-crls/nameConstraintsDN3subCA2CRL.crl
-crls/nameConstraintsDN4CACRL.crl
-crls/nameConstraintsDN5CACRL.crl
-crls/nameConstraintsDNS1CACRL.crl
-crls/nameConstraintsDNS2CACRL.crl
-crls/nameConstraintsRFC822CA1CRL.crl
-crls/nameConstraintsRFC822CA2CRL.crl
-crls/nameConstraintsRFC822CA3CRL.crl
-crls/nameConstraintsURI1CACRL.crl
-crls/nameConstraintsURI2CACRL.crl
-crls/onlyContainsAttributeCertsCACRL.crl
-crls/onlyContainsCACertsCACRL.crl
-crls/onlyContainsUserCertsCACRL.crl
-crls/onlySomeReasonsCA1compromiseCRL.crl
-crls/onlySomeReasonsCA1otherreasonsCRL.crl
-crls/onlySomeReasonsCA2CRL1.crl
-crls/onlySomeReasonsCA2CRL2.crl
-crls/onlySomeReasonsCA3compromiseCRL.crl
-crls/onlySomeReasonsCA3otherreasonsCRL.crl
-crls/onlySomeReasonsCA4compromiseCRL.crl
-crls/onlySomeReasonsCA4otherreasonsCRL.crl
-crls/pathLenConstraint0CACRL.crl
-crls/pathLenConstraint0subCA2CRL.crl
-crls/pathLenConstraint0subCACRL.crl
-crls/pathLenConstraint1CACRL.crl
-crls/pathLenConstraint1subCACRL.crl
-crls/pathLenConstraint6CACRL.crl
-crls/pathLenConstraint6subCA0CRL.crl
-crls/pathLenConstraint6subCA1CRL.crl
-crls/pathLenConstraint6subCA4CRL.crl
-crls/pathLenConstraint6subsubCA00CRL.crl
-crls/pathLenConstraint6subsubCA11CRL.crl
-crls/pathLenConstraint6subsubCA41CRL.crl
-crls/pathLenConstraint6subsubsubCA11XCRL.crl
-crls/pathLenConstraint6subsubsubCA41XCRL.crl
-crls/pre2000CRLnextUpdateCACRL.crl
-crls/requireExplicitPolicy0CACRL.crl
-crls/requireExplicitPolicy0subCACRL.crl
-crls/requireExplicitPolicy0subsubCACRL.crl
-crls/requireExplicitPolicy0subsubsubCACRL.crl
-crls/requireExplicitPolicy10CACRL.crl
-crls/requireExplicitPolicy10subCACRL.crl
-crls/requireExplicitPolicy10subsubCACRL.crl
-crls/requireExplicitPolicy10subsubsubCACRL.crl
-crls/requireExplicitPolicy2CACRL.crl
-crls/requireExplicitPolicy2subCACRL.crl
-crls/requireExplicitPolicy4CACRL.crl
-crls/requireExplicitPolicy4subCACRL.crl
-crls/requireExplicitPolicy4subsubCACRL.crl
-crls/requireExplicitPolicy4subsubsubCACRL.crl
-crls/requireExplicitPolicy5CACRL.crl
-crls/requireExplicitPolicy5subCACRL.crl
-crls/requireExplicitPolicy5subsubCACRL.crl
-crls/requireExplicitPolicy5subsubsubCACRL.crl
-crls/requireExplicitPolicy7CACRL.crl
-crls/requireExplicitPolicy7subCARE2CRL.crl
-crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl
-crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl
diff --git a/pki/testdata/nist-pkits/test_bundle_data.globlist b/pki/testdata/nist-pkits/test_bundle_data.globlist
deleted file mode 100644
index e74c3d7..0000000
--- a/pki/testdata/nist-pkits/test_bundle_data.globlist
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2023 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# See build/ios/update_bundle_filelist.py for details on how .globlist
-# files are used to update their .filelist counterparts.
-
-certs/*.crt
-crls/*.crl
diff --git a/sources.cmake b/sources.cmake
index c28ee65..dcdf497 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -533,27 +533,14 @@
   pki/testdata/cert_issuer_source_static_unittest/d.pem
   pki/testdata/cert_issuer_source_static_unittest/e1.pem
   pki/testdata/cert_issuer_source_static_unittest/e2.pem
-  pki/testdata/cert_issuer_source_static_unittest/generate-certs.py
   pki/testdata/cert_issuer_source_static_unittest/i1_1.pem
   pki/testdata/cert_issuer_source_static_unittest/i1_2.pem
   pki/testdata/cert_issuer_source_static_unittest/i2.pem
   pki/testdata/cert_issuer_source_static_unittest/i3_1.pem
   pki/testdata/cert_issuer_source_static_unittest/i3_2.pem
-  pki/testdata/cert_issuer_source_static_unittest/keys/C1.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/C2.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/D.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/E1.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/E2.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/I1.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/I2.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/I3.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/I3_1.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/Root.key
-  pki/testdata/cert_issuer_source_static_unittest/keys/i1_1.key
   pki/testdata/cert_issuer_source_static_unittest/root.pem
   pki/testdata/certificate_policies_unittest/anypolicy.pem
   pki/testdata/certificate_policies_unittest/anypolicy_with_qualifier.pem
-  pki/testdata/certificate_policies_unittest/generate_policies.py
   pki/testdata/certificate_policies_unittest/invalid-anypolicy_with_custom_qualifier.pem
   pki/testdata/certificate_policies_unittest/invalid-empty.pem
   pki/testdata/certificate_policies_unittest/invalid-policy_1_2_3_dupe.pem
@@ -582,7 +569,6 @@
   pki/testdata/crl_unittest/bad_thisupdate_in_future.pem
   pki/testdata/crl_unittest/bad_thisupdate_too_old.pem
   pki/testdata/crl_unittest/bad_wrong_issuer.pem
-  pki/testdata/crl_unittest/generate_crl_test_data.py
   pki/testdata/crl_unittest/good.pem
   pki/testdata/crl_unittest/good_fake_extension.pem
   pki/testdata/crl_unittest/good_fake_extension_no_nextupdate.pem
@@ -653,7 +639,6 @@
   pki/testdata/name_constraints_unittest/dnsname2.pem
   pki/testdata/name_constraints_unittest/edipartyname-excluded.pem
   pki/testdata/name_constraints_unittest/edipartyname-permitted.pem
-  pki/testdata/name_constraints_unittest/generate_name_constraints.py
   pki/testdata/name_constraints_unittest/invalid-empty_excluded_subtree.pem
   pki/testdata/name_constraints_unittest/invalid-empty_permitted_subtree.pem
   pki/testdata/name_constraints_unittest/invalid-no_subtrees.pem
@@ -741,8 +726,6 @@
   pki/testdata/name_constraints_unittest/uri-permitted.pem
   pki/testdata/name_constraints_unittest/x400address-excluded.pem
   pki/testdata/name_constraints_unittest/x400address-permitted.pem
-  pki/testdata/nist-pkits/BUILD.gn
-  pki/testdata/nist-pkits/README.chromium
   pki/testdata/nist-pkits/certs/AllCertificatesNoPoliciesTest2EE.crt
   pki/testdata/nist-pkits/certs/AllCertificatesSamePoliciesTest10EE.crt
   pki/testdata/nist-pkits/certs/AllCertificatesSamePoliciesTest13EE.crt
@@ -1321,11 +1304,6 @@
   pki/testdata/nist-pkits/crls/requireExplicitPolicy7subCARE2CRL.crl
   pki/testdata/nist-pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl
   pki/testdata/nist-pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl
-  pki/testdata/nist-pkits/generate_tests.py
-  pki/testdata/nist-pkits/pkits_testcases-inl.h
-  pki/testdata/nist-pkits/test_bundle_data.filelist
-  pki/testdata/nist-pkits/test_bundle_data.globlist
-  pki/testdata/ocsp_unittest/annotate_test_data.py
   pki/testdata/ocsp_unittest/bad_ocsp_type.pem
   pki/testdata/ocsp_unittest/bad_signature.pem
   pki/testdata/ocsp_unittest/bad_status.pem
@@ -1338,7 +1316,6 @@
   pki/testdata/ocsp_unittest/has_extension.pem
   pki/testdata/ocsp_unittest/has_single_extension.pem
   pki/testdata/ocsp_unittest/has_version.pem
-  pki/testdata/ocsp_unittest/make_ocsp.py
   pki/testdata/ocsp_unittest/malformed_request.pem
   pki/testdata/ocsp_unittest/missing_response.pem
   pki/testdata/ocsp_unittest/multiple_response.pem
@@ -1357,7 +1334,6 @@
   pki/testdata/parse_certificate_unittest/authority_key_identifier/empty_sequence.pem
   pki/testdata/parse_certificate_unittest/authority_key_identifier/extra_contents_after_extension_sequence.pem
   pki/testdata/parse_certificate_unittest/authority_key_identifier/extra_contents_after_issuer_and_serial.pem
-  pki/testdata/parse_certificate_unittest/authority_key_identifier/generate.py
   pki/testdata/parse_certificate_unittest/authority_key_identifier/invalid_contents.pem
   pki/testdata/parse_certificate_unittest/authority_key_identifier/invalid_issuer.pem
   pki/testdata/parse_certificate_unittest/authority_key_identifier/invalid_key_identifier.pem
@@ -1416,8 +1392,6 @@
   pki/testdata/parse_certificate_unittest/policy_constraints_inhibit_require.pem
   pki/testdata/parse_certificate_unittest/policy_constraints_require.pem
   pki/testdata/parse_certificate_unittest/policy_qualifiers_empty_sequence.pem
-  pki/testdata/parse_certificate_unittest/rebase-errors.py
-  pki/testdata/parse_certificate_unittest/regenerate_pem_from_ascii.py
   pki/testdata/parse_certificate_unittest/serial_37_bytes.pem
   pki/testdata/parse_certificate_unittest/serial_negative.pem
   pki/testdata/parse_certificate_unittest/serial_not_minimal.pem
@@ -1462,18 +1436,12 @@
   pki/testdata/parse_certificate_unittest/v1_explicit_version.pem
   pki/testdata/parse_certificate_unittest/v3_certificate_template.pk8
   pki/testdata/parse_certificate_unittest/v3_certificate_template.txt
-  pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/generate-certs.py
   pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/int_match_name_only.pem
   pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/int_matching.pem
   pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/int_mismatch.pem
-  pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/keys/Intermediate.key
-  pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/keys/Root.key
-  pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/keys/Root2.key
-  pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/keys/Target.key
   pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/root.pem
   pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/root2.pem
   pki/testdata/path_builder_unittest/key_id_name_and_serial_prioritization/target.pem
-  pki/testdata/path_builder_unittest/key_id_prioritization/generate-certs.py
   pki/testdata/path_builder_unittest/key_id_prioritization/int_different_ski_a.pem
   pki/testdata/path_builder_unittest/key_id_prioritization/int_different_ski_b.pem
   pki/testdata/path_builder_unittest/key_id_prioritization/int_different_ski_c.pem
@@ -1483,10 +1451,6 @@
   pki/testdata/path_builder_unittest/key_id_prioritization/int_no_ski_a.pem
   pki/testdata/path_builder_unittest/key_id_prioritization/int_no_ski_b.pem
   pki/testdata/path_builder_unittest/key_id_prioritization/int_no_ski_c.pem
-  pki/testdata/path_builder_unittest/key_id_prioritization/keys/Intermediate.key
-  pki/testdata/path_builder_unittest/key_id_prioritization/keys/Intermediate_1.key
-  pki/testdata/path_builder_unittest/key_id_prioritization/keys/Root.key
-  pki/testdata/path_builder_unittest/key_id_prioritization/keys/Target.key
   pki/testdata/path_builder_unittest/key_id_prioritization/root.pem
   pki/testdata/path_builder_unittest/key_id_prioritization/target.pem
   pki/testdata/path_builder_unittest/multi-root-A-by-B.pem
@@ -1499,46 +1463,22 @@
   pki/testdata/path_builder_unittest/multi-root-F-by-E.pem
   pki/testdata/path_builder_unittest/precertificate/precertificate.pem
   pki/testdata/path_builder_unittest/precertificate/root.pem
-  pki/testdata/path_builder_unittest/self_issued_prioritization/generate-certs.py
-  pki/testdata/path_builder_unittest/self_issued_prioritization/keys/Root1.key
-  pki/testdata/path_builder_unittest/self_issued_prioritization/keys/Root2.key
-  pki/testdata/path_builder_unittest/self_issued_prioritization/keys/Target.key
   pki/testdata/path_builder_unittest/self_issued_prioritization/root1.pem
   pki/testdata/path_builder_unittest/self_issued_prioritization/root1_cross.pem
   pki/testdata/path_builder_unittest/self_issued_prioritization/root2.pem
   pki/testdata/path_builder_unittest/self_issued_prioritization/target.pem
-  pki/testdata/path_builder_unittest/validity_date_prioritization/generate-certs.py
   pki/testdata/path_builder_unittest/validity_date_prioritization/int_ac.pem
   pki/testdata/path_builder_unittest/validity_date_prioritization/int_ad.pem
   pki/testdata/path_builder_unittest/validity_date_prioritization/int_bc.pem
   pki/testdata/path_builder_unittest/validity_date_prioritization/int_bd.pem
-  pki/testdata/path_builder_unittest/validity_date_prioritization/keys/Intermediate.key
-  pki/testdata/path_builder_unittest/validity_date_prioritization/keys/Root.key
-  pki/testdata/path_builder_unittest/validity_date_prioritization/keys/Target.key
   pki/testdata/path_builder_unittest/validity_date_prioritization/root.pem
   pki/testdata/path_builder_unittest/validity_date_prioritization/target.pem
-  pki/testdata/verify_certificate_chain_unittest/README
   pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/generate-chains.py
-  pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/keys/Intermediate.key
-  pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/keys/Intermediate_1.key
-  pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/keys/Root.key
-  pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/basic-constraints-pathlen-0-self-issued/main.test
   pki/testdata/verify_certificate_chain_unittest/expired-intermediate/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/expired-intermediate/generate-chains.py
-  pki/testdata/verify_certificate_chain_unittest/expired-intermediate/keys/Intermediate.key
-  pki/testdata/verify_certificate_chain_unittest/expired-intermediate/keys/Root.key
-  pki/testdata/verify_certificate_chain_unittest/expired-intermediate/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/expired-intermediate/not-after.test
   pki/testdata/verify_certificate_chain_unittest/expired-intermediate/not-before.test
   pki/testdata/verify_certificate_chain_unittest/expired-root/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/expired-root/generate-chains.py
-  pki/testdata/verify_certificate_chain_unittest/expired-root/keys/Intermediate.key
-  pki/testdata/verify_certificate_chain_unittest/expired-root/keys/Root.key
-  pki/testdata/verify_certificate_chain_unittest/expired-root/keys/Target.key
-  pki/testdata/verify_certificate_chain_unittest/expired-root/keys/expired-unconstrained-root_Root.key
-  pki/testdata/verify_certificate_chain_unittest/expired-root/keys/expired-unconstrained-root_Target.key
   pki/testdata/verify_certificate_chain_unittest/expired-root/not-after-ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/expired-root/not-after-ta-with-expiration-and-constraints.test
   pki/testdata/verify_certificate_chain_unittest/expired-root/not-after-ta-with-expiration.test
@@ -1546,22 +1486,14 @@
   pki/testdata/verify_certificate_chain_unittest/expired-root/not-before-ta-with-expiration.test
   pki/testdata/verify_certificate_chain_unittest/expired-root/not-before.test
   pki/testdata/verify_certificate_chain_unittest/expired-target/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/expired-target/generate-chains.py
-  pki/testdata/verify_certificate_chain_unittest/expired-target/keys/Intermediate.key
-  pki/testdata/verify_certificate_chain_unittest/expired-target/keys/Root.key
-  pki/testdata/verify_certificate_chain_unittest/expired-target/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/expired-target/not-after.test
   pki/testdata/verify_certificate_chain_unittest/expired-target/not-before.test
-  pki/testdata/verify_certificate_chain_unittest/generate-all.sh
   pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/generate-chains.py
-  pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/keys/BogusRoot.key
   pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/incorrect-trust-anchor/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/keys/Intermediate_1.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/keys/Root.key
@@ -1569,13 +1501,11 @@
   pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-and-target-wrong-signature/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-ca-false/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-ca-false/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-ca-false/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-ca-false/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-ca-false/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-ca-false/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-not-critical/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-not-critical/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-not-critical/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-not-critical/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-basic-constraints-not-critical/keys/Target.key
@@ -1584,7 +1514,6 @@
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/chain.pem
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/clientauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/clientauth.test
-  pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-any-and-clientauth/keys/Target.key
@@ -1594,13 +1523,11 @@
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/chain.pem
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/clientauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/clientauth.test
-  pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/serverauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-clientauth/serverauth.test
-  pki/testdata/verify_certificate_chain_unittest/intermediate-eku-server-gated-crypto/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-server-gated-crypto/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-server-gated-crypto/keys/Intermediate_1.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-server-gated-crypto/keys/Root.key
@@ -1620,37 +1547,31 @@
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-server-gated-crypto/sha256-eku-serverAuth-strict.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-eku-server-gated-crypto/sha256-eku-serverAuth.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-basic-constraints/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-basic-constraints/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-basic-constraints/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-basic-constraints/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-basic-constraints/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-basic-constraints/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-signing-key-usage/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-signing-key-usage/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-signing-key-usage/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-signing-key-usage/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-signing-key-usage/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-lacks-signing-key-usage/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-signed-with-sha1/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-signed-with-sha1/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-signed-with-sha1/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-signed-with-sha1/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-signed-with-sha1/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-signed-with-sha1/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-critical-extension/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-critical-extension/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-critical-extension/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-critical-extension/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-critical-extension/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-critical-extension/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-non-critical-extension/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-non-critical-extension/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-non-critical-extension/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-non-critical-extension/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-non-critical-extension/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-unknown-non-critical-extension/main.test
   pki/testdata/verify_certificate_chain_unittest/intermediate-wrong-signature-no-authority-key-identifier/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/intermediate-wrong-signature-no-authority-key-identifier/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/intermediate-wrong-signature-no-authority-key-identifier/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-wrong-signature-no-authority-key-identifier/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/intermediate-wrong-signature-no-authority-key-identifier/keys/Root_1.key
@@ -1660,7 +1581,6 @@
   pki/testdata/verify_certificate_chain_unittest/issuer-and-subject-not-byte-for-byte-equal/anchor.test
   pki/testdata/verify_certificate_chain_unittest/issuer-and-subject-not-byte-for-byte-equal/target.pem
   pki/testdata/verify_certificate_chain_unittest/issuer-and-subject-not-byte-for-byte-equal/target.test
-  pki/testdata/verify_certificate_chain_unittest/key-rollover/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/key-rollover/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/key-rollover/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/key-rollover/keys/Root_1.key
@@ -1673,7 +1593,6 @@
   pki/testdata/verify_certificate_chain_unittest/key-rollover/oldchain.test
   pki/testdata/verify_certificate_chain_unittest/key-rollover/rolloverchain.pem
   pki/testdata/verify_certificate_chain_unittest/key-rollover/rolloverchain.test
-  pki/testdata/verify_certificate_chain_unittest/many-names/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/many-names/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/many-names/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/many-names/keys/t0.key
@@ -1776,7 +1695,6 @@
   pki/testdata/verify_certificate_chain_unittest/many-names/toomany-ips-permitted.pem
   pki/testdata/verify_certificate_chain_unittest/many-names/toomany-ips-permitted.test
   pki/testdata/verify_certificate_chain_unittest/non-self-signed-root/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/non-self-signed-root/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/non-self-signed-root/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/non-self-signed-root/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/non-self-signed-root/keys/ShadowRoot.key
@@ -1878,92 +1796,78 @@
   pki/testdata/verify_certificate_chain_unittest/pkits_errors/4.9.7.txt
   pki/testdata/verify_certificate_chain_unittest/pkits_errors/4.9.8.txt
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-fail/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-anypolicy-by-root-ok/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-fail/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-inhibit-mapping-by-root-ok/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-ok/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-ok/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-ok/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-ok/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-ok/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-ok/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-ok/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-ok/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-on-root-wrong/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-fail/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/main.test
   pki/testdata/verify_certificate_chain_unittest/policies-required-by-root-ok/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/main.test
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-fail/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/main.test
   pki/testdata/verify_certificate_chain_unittest/policy-mappings-on-root-ok/ta-with-constraints.test
-  pki/testdata/verify_certificate_chain_unittest/rebase-errors.py
   pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/main.test
   pki/testdata/verify_certificate_chain_unittest/root-basic-constraints-ca-false/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/keys/Target.key
@@ -1974,7 +1878,6 @@
   pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/serverauth-ta-with-expiration.test
   pki/testdata/verify_certificate_chain_unittest/root-eku-clientauth/serverauth.test
   pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/keys/Target.key
@@ -1983,7 +1886,6 @@
   pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/ta-with-constraints.test
   pki/testdata/verify_certificate_chain_unittest/root-lacks-basic-constraints/ta-with-require-basic-constraints.test
   pki/testdata/verify_certificate_chain_unittest/root-lacks-keycertsign-key-usage/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/root-lacks-keycertsign-key-usage/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/root-lacks-keycertsign-key-usage/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/root-lacks-keycertsign-key-usage/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/root-lacks-keycertsign-key-usage/keys/Target.key
@@ -1992,7 +1894,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/chain.pem
   pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/distrusted-root-expired.test
   pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/distrusted-root.test
-  pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-and-intermediate/keys/Target.key
@@ -2006,7 +1907,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-eku-any/chain.pem
   pki/testdata/verify_certificate_chain_unittest/target-eku-any/clientauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/target-eku-any/clientauth.test
-  pki/testdata/verify_certificate_chain_unittest/target-eku-any/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-eku-any/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-any/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-any/keys/Target.key
@@ -2016,7 +1916,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/chain.pem
   pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/clientauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/clientauth.test
-  pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-clientauth/keys/Target.key
@@ -2026,7 +1925,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-eku-many/chain.pem
   pki/testdata/verify_certificate_chain_unittest/target-eku-many/clientauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/target-eku-many/clientauth.test
-  pki/testdata/verify_certificate_chain_unittest/target-eku-many/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-eku-many/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-many/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-many/keys/Target.key
@@ -2063,20 +1961,17 @@
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/chain.pem
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/clientauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/clientauth.test
-  pki/testdata/verify_certificate_chain_unittest/target-eku-none/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/serverauth-strict.test
   pki/testdata/verify_certificate_chain_unittest/target-eku-none/serverauth.test
   pki/testdata/verify_certificate_chain_unittest/target-has-512bit-rsa-key/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-has-512bit-rsa-key/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-has-512bit-rsa-key/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-has-512bit-rsa-key/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-has-512bit-rsa-key/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-has-512bit-rsa-key/main.test
   pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/keys/Target.key
@@ -2086,38 +1981,32 @@
   pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/target_only-trusted_leaf.test
   pki/testdata/verify_certificate_chain_unittest/target-has-ca-basic-constraints/target_only.pem
   pki/testdata/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/main.test
   pki/testdata/verify_certificate_chain_unittest/target-has-pathlen-but-not-ca/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-has-pathlen-but-not-ca/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-has-pathlen-but-not-ca/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-has-pathlen-but-not-ca/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-has-pathlen-but-not-ca/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-has-pathlen-but-not-ca/main.test
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-and-eku/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-and-eku/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-and-eku/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-and-eku/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-and-eku/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-and-eku/main.test
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-no-eku/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-no-eku/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-no-eku/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-no-eku/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-no-eku/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-msapplicationpolicies-no-eku/main.test
   pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/main.test
   pki/testdata/verify_certificate_chain_unittest/target-not-end-entity/strict.test
   pki/testdata/verify_certificate_chain_unittest/target-only/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-only/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-only/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-only/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-only/trusted_anchor.test
@@ -2127,7 +2016,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-only/trusted_leaf.test
   pki/testdata/verify_certificate_chain_unittest/target-only/trusted_leaf_require_self_signed.test
   pki/testdata/verify_certificate_chain_unittest/target-selfissued/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-selfissued/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-selfissued/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-selfissued/keys/Target_1.key
   pki/testdata/verify_certificate_chain_unittest/target-selfissued/trusted_anchor.test
@@ -2135,7 +2023,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-selfissued/trusted_leaf.test
   pki/testdata/verify_certificate_chain_unittest/target-selfissued/trusted_leaf_require_self_signed.test
   pki/testdata/verify_certificate_chain_unittest/target-selfsigned/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-selfsigned/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-selfsigned/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-selfsigned/trusted_leaf-and-trust_anchor.test
   pki/testdata/verify_certificate_chain_unittest/target-selfsigned/trusted_leaf-not_after.test
@@ -2150,7 +2037,6 @@
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.test
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.pem
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.test
-  pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-ec.key
@@ -2164,25 +2050,21 @@
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem
   pki/testdata/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.test
   pki/testdata/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/main.test
   pki/testdata/verify_certificate_chain_unittest/target-signed-using-ecdsa/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-signed-using-ecdsa/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-signed-using-ecdsa/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-using-ecdsa/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-using-ecdsa/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-using-ecdsa/main.test
   pki/testdata/verify_certificate_chain_unittest/target-signed-with-sha1/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-signed-with-sha1/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-signed-with-sha1/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-with-sha1/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-with-sha1/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-signed-with-sha1/main.test
   pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/keys/Target.key
@@ -2190,40 +2072,34 @@
   pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/target_only-trusted_leaf.test
   pki/testdata/verify_certificate_chain_unittest/target-unknown-critical-extension/target_only.pem
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/keys/Intermediate_1.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature-no-authority-key-identifier/main.test
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/keys/Intermediate_1.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/target-wrong-signature/main.test
   pki/testdata/verify_certificate_chain_unittest/unknown-critical-policy-qualifier/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/unknown-critical-policy-qualifier/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/unknown-critical-policy-qualifier/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/unknown-critical-policy-qualifier/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/unknown-critical-policy-qualifier/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/unknown-critical-policy-qualifier/main.test
   pki/testdata/verify_certificate_chain_unittest/unknown-non-critical-policy-qualifier/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/unknown-non-critical-policy-qualifier/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/unknown-non-critical-policy-qualifier/keys/Intermediate.key
   pki/testdata/verify_certificate_chain_unittest/unknown-non-critical-policy-qualifier/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/unknown-non-critical-policy-qualifier/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/unknown-non-critical-policy-qualifier/main.test
   pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/keys/Intermediate1.key
   pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/keys/Intermediate2.key
   pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/keys/Root.key
   pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/keys/Target.key
   pki/testdata/verify_certificate_chain_unittest/violates-basic-constraints-pathlen-0/main.test
   pki/testdata/verify_certificate_chain_unittest/violates-pathlen-1-from-root/chain.pem
-  pki/testdata/verify_certificate_chain_unittest/violates-pathlen-1-from-root/generate-chains.py
   pki/testdata/verify_certificate_chain_unittest/violates-pathlen-1-from-root/keys/Intermediate1.key
   pki/testdata/verify_certificate_chain_unittest/violates-pathlen-1-from-root/keys/Intermediate2.key
   pki/testdata/verify_certificate_chain_unittest/violates-pathlen-1-from-root/keys/Root.key
@@ -2312,9 +2188,6 @@
   pki/testdata/verify_name_match_unittest/names/unicode_supplementary-UTF8-unmangled.pem
   pki/testdata/verify_name_match_unittest/names/valid-Name-empty.pem
   pki/testdata/verify_name_match_unittest/names/valid-minimal.pem
-  pki/testdata/verify_name_match_unittest/scripts/generate_names.py
-  pki/testdata/verify_signed_data_unittest/README
-  pki/testdata/verify_signed_data_unittest/annotate_test_data.py
   pki/testdata/verify_signed_data_unittest/ecdsa-prime256v1-sha512-spki-params-null.pem
   pki/testdata/verify_signed_data_unittest/ecdsa-prime256v1-sha512-unused-bits-signature.pem
   pki/testdata/verify_signed_data_unittest/ecdsa-prime256v1-sha512-using-ecdh-key.pem