diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
deleted file mode 100644
index 7b41737..0000000
--- a/.github/workflows/build-test.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Run tests on all
-
-on:
-  push:
-    branches: [ BigRefactor ]
-
-jobs:
-  build:
-    runs-on: [ self-hosted ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.18.3
-    - name: Test
-      run: go test -v ./...
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c4f05a..8568acd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Run tests
+    name: Run Build Tests
 
     steps:
       - uses: actions/checkout@v3
@@ -47,3 +47,16 @@ jobs:
           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: '1.18.3'
+      
+      - name: Test
+        run: go test -v ./...
\ No newline at end of file