diff --git a/sdk/keyvault/keyvault-certificates/.eslintrc.json b/sdk/keyvault/keyvault-certificates/.eslintrc.json
index d2b796507a59..f733ef036321 100644
--- a/sdk/keyvault/keyvault-certificates/.eslintrc.json
+++ b/sdk/keyvault/keyvault-certificates/.eslintrc.json
@@ -1,13 +1,9 @@
 {
   "plugins": ["@azure/azure-sdk"],
-  "extends": ["../../.eslintrc.old.json", "plugin:@azure/azure-sdk/recommended"],
-  "parserOptions": {
-    "project": "tsconfig.eslint.json"
-  },
+  "extends": ["plugin:@azure/azure-sdk/azure-sdk-base"],
   "ignorePatterns": ["src/core"],
   "rules": {
     "@typescript-eslint/no-this-alias": "off",
-    "no-invalid-this": "off",
-    "@azure/azure-sdk/ts-package-json-files-required": "off"
+    "no-invalid-this": "off"
   }
 }
diff --git a/sdk/keyvault/keyvault-certificates/package.json b/sdk/keyvault/keyvault-certificates/package.json
index 437e9a7b096a..e54d71aa0a39 100644
--- a/sdk/keyvault/keyvault-certificates/package.json
+++ b/sdk/keyvault/keyvault-certificates/package.json
@@ -55,9 +55,9 @@
     "integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --no-timeouts --full-trace dist-esm/test/*.test.js",
     "integration-test:node:no-timeout": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --no-timeouts --full-trace dist-esm/test/*.test.js",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
-    "lint:fix": "eslint package.json \"src/**/*.ts\" --fix --fix-type [problem,suggestion]",
-    "lint": "eslint package.json \"src/**/*.ts\" samples --ext .ts -f html -o keyvault-certificates-lintReport.html",
-    "lint:terminal": "eslint package.json \"src/**/*.ts\" samples --ext .ts",
+    "lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
+    "lint": "eslint package.json api-extractor.json src test --ext .ts -f html -o search-lintReport.html || exit 0",
+    "lint:terminal": "eslint package.json api-extractor.json src test --ext .ts",
     "pack": "npm pack 2>&1",
     "prebuild": "npm run clean",
     "regenerate": "npx autorest swagger/README.md --typescript",
@@ -93,7 +93,7 @@
     "tslib": "^1.10.0"
   },
   "devDependencies": {
-    "@azure/eslint-plugin-azure-sdk": "^2.0.1",
+    "@azure/eslint-plugin-azure-sdk": "^3.0.0",
     "@azure/identity": "^1.1.0-preview",
     "@azure/keyvault-keys": "^4.1.0-preview.1",
     "@azure/keyvault-secrets": "^4.1.0-preview.1",
diff --git a/sdk/keyvault/keyvault-certificates/test/CRUD.test.ts b/sdk/keyvault/keyvault-certificates/test/CRUD.test.ts
index d2607da8e0a8..ee19091b6a22 100644
--- a/sdk/keyvault/keyvault-certificates/test/CRUD.test.ts
+++ b/sdk/keyvault/keyvault-certificates/test/CRUD.test.ts
@@ -382,7 +382,7 @@ describe("Certificates client - create, read, update and delete", () => {
         certificateName,
         testPollerProperties
       );
-      let deletedCertificate = await deletePoller.pollUntilDone();
+      const deletedCertificate = await deletePoller.pollUntilDone();
       assert.equal(
         deletedCertificate.name,
         certificateName,
diff --git a/sdk/keyvault/keyvault-certificates/test/list.test.ts b/sdk/keyvault/keyvault-certificates/test/list.test.ts
index 232edd58849b..0b9e9f276bfe 100644
--- a/sdk/keyvault/keyvault-certificates/test/list.test.ts
+++ b/sdk/keyvault/keyvault-certificates/test/list.test.ts
@@ -51,12 +51,16 @@ describe("Certificates client - list certificates in various ways", () => {
     })) {
       try {
         await testClient.flushCertificate(certificate.name!);
-      } catch (e) {}
+      } catch (e) {
+        // Nothing to do here        
+      }
     }
     for await (const certificate of client.listDeletedCertificates({ includePending: true })) {
       try {
         await testClient.purgeCertificate(certificate.name!);
-      } catch (e) {}
+      } catch (e) {
+        // Nothing to do here
+      }
     }
   });
 
diff --git a/sdk/keyvault/keyvault-certificates/test/recoverBackupRestore.test.ts b/sdk/keyvault/keyvault-certificates/test/recoverBackupRestore.test.ts
index 92b81cdeece5..fefac4b2d47c 100644
--- a/sdk/keyvault/keyvault-certificates/test/recoverBackupRestore.test.ts
+++ b/sdk/keyvault/keyvault-certificates/test/recoverBackupRestore.test.ts
@@ -87,6 +87,7 @@ describe("Certificates client - restore certificates and recover backups", () =>
       );
       const backup = await client.backupCertificate(certificateName);
       await testClient.flushCertificate(certificateName);
+      // eslint-disable-next-line no-constant-condition
       while (true) {
         try {
           await client.restoreCertificateBackup(backup as Uint8Array);
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/recorderUtils.ts b/sdk/keyvault/keyvault-certificates/test/utils/recorderUtils.ts
index a3829df33286..1e9e8c99bc9e 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/recorderUtils.ts
+++ b/sdk/keyvault/keyvault-certificates/test/utils/recorderUtils.ts
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 import { isNode } from "@azure/core-http";
 import * as dotenv from "dotenv";
 import * as path from "path";
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts b/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts
index a7506194cfb4..6825309e91ec 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts
+++ b/sdk/keyvault/keyvault-certificates/test/utils/testAuthentication.ts
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 import { ClientSecretCredential } from "@azure/identity";
 import { getKeyvaultName } from "./utils.common";
 import { CertificateClient } from "../../src";
diff --git a/sdk/keyvault/keyvault-certificates/test/utils/testClient.ts b/sdk/keyvault/keyvault-certificates/test/utils/testClient.ts
index 1e59efdcbac6..ca8f3010d8e0 100644
--- a/sdk/keyvault/keyvault-certificates/test/utils/testClient.ts
+++ b/sdk/keyvault/keyvault-certificates/test/utils/testClient.ts
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 import { CertificateClient } from "../../src";
 
 export default class TestClient {
diff --git a/sdk/keyvault/keyvault-certificates/tsconfig.eslint.json b/sdk/keyvault/keyvault-certificates/tsconfig.eslint.json
deleted file mode 100644
index aba1a43e732e..000000000000
--- a/sdk/keyvault/keyvault-certificates/tsconfig.eslint.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "exclude": ["node_modules"],
-  "include": ["./src/**/*.ts", "./test/**/*.ts", "./samples/**/*.ts"]
-}