diff --git a/common/tools/eslint-plugin-azure-sdk/ci.yml b/common/tools/eslint-plugin-azure-sdk/ci.yml
index 270e5c68238..b1aa8216104 100644
--- a/common/tools/eslint-plugin-azure-sdk/ci.yml
+++ b/common/tools/eslint-plugin-azure-sdk/ci.yml
@@ -33,4 +33,4 @@ jobs:
       - template: /eng/pipelines/templates/steps/common.yml
 
       # Run lint step for all SDK
-      - template: /eng/pipelines/templates/steps/run-eslint.yml
+      - template: /eng/pipelines/templates/steps/test-eslint.yml
diff --git a/eng/pipelines/templates/steps/run-eslint.yml b/eng/pipelines/templates/steps/run-eslint.yml
index d64fdf99491..f47e93124c2 100644
--- a/eng/pipelines/templates/steps/run-eslint.yml
+++ b/eng/pipelines/templates/steps/run-eslint.yml
@@ -10,7 +10,3 @@ steps:
       node common/scripts/install-run-rush.js build -t @azure/eslint-plugin-azure-sdk
       node eng/tools/rush-runner.js lint "${{parameters.ServiceDirectory}}" -p max
     displayName: "Build ESLint Plugin and Lint Libraries"
-
-  - pwsh: |
-      node common/scripts/install-run-rush.js test -t @azure/eslint-plugin-azure-sdk --verbose
-    displayName: "Run ESLint Plugin Unit Tests"
diff --git a/eng/pipelines/templates/steps/test-eslint.yml b/eng/pipelines/templates/steps/test-eslint.yml
new file mode 100644
index 00000000000..d64fdf99491
--- /dev/null
+++ b/eng/pipelines/templates/steps/test-eslint.yml
@@ -0,0 +1,16 @@
+parameters:
+  ServiceDirectory: ''
+
+steps:
+  - script: |
+      node common/scripts/install-run-rush.js install
+    displayName: "Install library dependencies"
+
+  - pwsh: |
+      node common/scripts/install-run-rush.js build -t @azure/eslint-plugin-azure-sdk
+      node eng/tools/rush-runner.js lint "${{parameters.ServiceDirectory}}" -p max
+    displayName: "Build ESLint Plugin and Lint Libraries"
+
+  - pwsh: |
+      node common/scripts/install-run-rush.js test -t @azure/eslint-plugin-azure-sdk --verbose
+    displayName: "Run ESLint Plugin Unit Tests"