diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
index fd2cb13cc..f74ebc600 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
@@ -750,7 +750,7 @@ TEST_F(KeyVaultCertificateClientTest, GetDeletedCertificates)
 
 TEST_F(KeyVaultCertificateClientTest, DownloadImportPkcs_LIVEONLY_)
 {
-  auto testName = ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  auto testName = GetTestName();
   std::string const pkcs(testName);
   std::string const importName(pkcs + "2");
 
@@ -782,12 +782,11 @@ TEST_F(KeyVaultCertificateClientTest, DownloadImportPkcs_LIVEONLY_)
 
 TEST_F(KeyVaultCertificateClientTest, DownloadImportPem_LIVEONLY_)
 {
-  auto testName = ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  auto testName = GetTestName();
   std::string const pem(testName);
   std::string const importName(pem + "2");
 
   auto const& client = GetClientForTest(testName);
-
   auto originalCertificate
       = CreateCertificate(pem, client, m_defaultWait, "CN=xyz", CertificateContentType::Pem);