diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4dc9454..5a9a3ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,35 +46,4 @@ jobs:
           ARCHS='amd64 386 arm64 arm'
           for i in ${ARCHS}; do
             env CGO_ENABLED=0 GOOS=freebsd GOARCH=${i} go build -ldflags "-s -w"
-          done
-  test-windows:
-    runs-on: [ self-hosted, Windows]
-    name: Test on Windows
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version-file: 'go.mod'
-      
-      - name: Test
-        run: go test -v ./...
-        env:
-          CGO_ENABLED: 0
-
-  test-ubuntu:
-    runs-on: [ self-hosted, Linux]
-    name: Test on Ubuntu
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version-file: 'go.mod'
-
-      - name: Test
-        run: go test -v ./...
-        env:
-          CGO_ENABLED: 0
\ No newline at end of file
+          done
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..8309a18
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,40 @@
+name: Run tests on self-hosted runners
+
+on:
+  push:
+    branches: [ BigRefactor ]
+  pull_request:
+    branches: [ BigRefactor ]
+
+jobs:
+  test-windows:
+    runs-on: [ self-hosted, Windows]
+    name: Test on Windows
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version-file: 'go.mod'
+      
+      - name: Test
+        run: go test -v ./...
+        env:
+          CGO_ENABLED: 0
+
+  test-ubuntu:
+    runs-on: [ self-hosted, Linux]
+    name: Test on Ubuntu
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version-file: 'go.mod'
+
+      - name: Test
+        run: go test -v ./...
+        env:
+          CGO_ENABLED: 0
\ No newline at end of file