diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 757bac18..e49372df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,24 +36,6 @@ jobs:
         run: |
           forge test -vvv
         id: test
-
-  hardhat-test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.x]
-    steps:
-        - name: Use Node.js ${{ matrix.node-version }}
-          uses: actions/setup-node@v1
-          with:
-            node-version: ${{ matrix.node-version }}
-        - name: Checkout code
-          uses: actions/checkout@v2
-        - name: setup
-          run: npm i 
-        - name: test
-          run: npx hardhat test
   
   lint:
     strategy:
diff --git a/.github/workflows/testhardhat.yml b/.github/workflows/testhardhat.yml
new file mode 100644
index 00000000..e5eec43c
--- /dev/null
+++ b/.github/workflows/testhardhat.yml
@@ -0,0 +1,31 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Main CI
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    steps:
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: setup
+        run: npm i
+      - name: test
+        run: npm run test
\ No newline at end of file
diff --git a/package.json b/package.json
index 818d8534..8dcbbece 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "deployApplications:backstopTestnet0": "npx hardhat run src/deployment/4_deployL1Applications.js --network sepolia && npx hardhat run src/deployment/5_deployL2Applications.js --network backstopTestnet0 && npx hardhat run src/deployment/6_chainInfoUpdate.js --network sepolia && npx hardhat run src/deployment/7_claimChainInfo.js --network backstopTestnet0",
     "compile": "npx hardhat compile",
     "lintjs": "npx eslint ./src",
-    "lintjs:fix": "npx eslint ./src --fix"
+    "lintjs:fix": "npx eslint ./src --fix",
+    "test": "npx hardhat test"
   },
   "dependencies": {
     "axios": "^1.6.2",