A customer of a computing resource provider is associated with a key provided by a key management system. When the key is generated, a value is generated and encrypted with the key. In response to a detection of a trigger to re-encrypt the customer's key, the encrypted value is used to verify validity of the re-encrypted customer's key before committing it to storage and made available for use.