diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
index 5d6a8c63522..5546886ce17 100644
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -572,8 +572,6 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine,
     world = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
      CERT_STORE_CREATE_NEW_FLAG, NULL);
     CertAddStoreToCollection(world, engine->hWorld, 0, 0);
-    if (cert->hCertStore)
-        CertAddStoreToCollection(world, cert->hCertStore, 0, 0);
     if (hAdditionalStore)
         CertAddStoreToCollection(world, hAdditionalStore, 0, 0);
     /* FIXME: only simple chains are supported for now, as CTLs aren't
diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index 0698e2c131a..93bbe2c3775 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -1583,7 +1583,7 @@ static ChainCheck chainCheckNoStore[] = {
      { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT |
        CERT_TRUST_IS_NOT_TIME_VALID, 0 },
      1, simpleStatus8NoStore },
-   TODO_ELEMENTS | TODO_ERROR | TODO_INFO },
+   TODO_CHAIN | TODO_ERROR | TODO_INFO },
 };
 
 /* Wednesday, Oct 1, 2007 */