diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml
index 59d32ed..7bd138e 100644
--- a/.github/workflows/dashboard.yml
+++ b/.github/workflows/dashboard.yml
@@ -1,17 +1,11 @@
 name: Dashboard image
 
 on:
-  push:
-    branches:
-      - "master"
-    paths-ignore:
-      - "cmd/playground/**"
-      - "cmd/agent/**"
-      - "script/**"
-      - "*.md"
-      - ".*"
-      - ".github/workflows/agent.yml"
-      - ".github/workflows/test.yml"
+  workflow_run:
+    workflows: ["Run Tests"]
+    branches: [master]
+    types: 
+      - completed
 
 jobs:
   deploy:
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
new file mode 100644
index 0000000..ab63f18
--- /dev/null
+++ b/.github/workflows/test-on-pr.yml
@@ -0,0 +1,24 @@
+name: Run Tests on PR
+
+on:
+  pull_request:
+    branches:
+      - master
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    env:
+      GO111MODULE: on
+    steps:
+      - uses: actions/checkout@v2
+      - name: Unit test
+        run: |
+          go test -v ./...
+      - name: Build test
+        run: |
+          go build cmd/dashboard/main.go
+          go build cmd/agent/main.go
+      - name: Run Gosec Security Scanner
+        uses: securego/gosec@master
+        with:
+          args: -exclude=G104 ./...
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index acff8d8..b4b3b20 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,11 +1,9 @@
-name: Run Test
+name: Run Tests
+
 on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
 jobs:
   tests:
     runs-on: ubuntu-latest