diff --git a/.eslintrc.js b/.eslintrc.js
index df3ff9fb5..69d2fd097 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -13,16 +13,5 @@ module.exports = {
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
-  },
-  "overrides": [
-    {
-      "files": [
-        "**/__tests__/*.{j,t}s?(x)",
-        "**/tests/unit/**/*.spec.{j,t}s?(x)"
-      ],
-      "env": {
-        "jest": true
-      }
-    }
-  ]
+  }
 }
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
index c8c81bf69..108d78814 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -26,5 +26,8 @@ module.exports = {
         "^primevue/overlayeventbus(.*)$": "<rootDir>/src/components/overlayeventbus/OverlayEventBus.js",
         "^primevue/terminalservice(.*)$": "<rootDir>/src/components/terminalservice/TerminalService.js",
         "^primevue/virtualscroller(.*)$": "<rootDir>/src/components/virtualscroller/VirtualScroller.vue"
-    }
+    },
+    testMatch: [
+        "**/src/components/**/*.spec.{j,t}s?(x)"
+    ]
 }
\ No newline at end of file
diff --git a/tests/unit/Accordion.spec.js b/src/components/accordion/Accordion.spec.js
similarity index 100%
rename from tests/unit/Accordion.spec.js
rename to src/components/accordion/Accordion.spec.js
diff --git a/tests/unit/Button.spec.js b/src/components/button/Button.spec.js
similarity index 100%
rename from tests/unit/Button.spec.js
rename to src/components/button/Button.spec.js
diff --git a/tests/unit/Dialog.spec.js b/src/components/dialog/Dialog.spec.js
similarity index 100%
rename from tests/unit/Dialog.spec.js
rename to src/components/dialog/Dialog.spec.js
diff --git a/tests/unit/Dropdown.spec.js b/src/components/dropdown/Dropdown.spec.js
similarity index 100%
rename from tests/unit/Dropdown.spec.js
rename to src/components/dropdown/Dropdown.spec.js
diff --git a/tests/unit/InputText.spec.js b/src/components/inputtext/InputText.spec.js
similarity index 100%
rename from tests/unit/InputText.spec.js
rename to src/components/inputtext/InputText.spec.js
diff --git a/tests/unit/Tag.spec.js b/src/components/tag/Tag.spec.js
similarity index 100%
rename from tests/unit/Tag.spec.js
rename to src/components/tag/Tag.spec.js
diff --git a/tests/unit/.eslintrc.js b/tests/unit/.eslintrc.js
deleted file mode 100644
index 013a195bf..000000000
--- a/tests/unit/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  env: {
-    jest: true
-  }
-}
\ No newline at end of file