diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6977112b..d4e2a14c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,6 +47,17 @@ jobs:
         ./waf.bat configure -T debug
         ./waf.bat build
 
+  build-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build windows-i386
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T debug -8
+        ./waf.bat build
+
   build-dedicated-windows-i386:
     runs-on: windows-2019
 
@@ -58,6 +69,17 @@ jobs:
         ./waf.bat configure -T debug -d
         ./waf.bat build
 
+  build-dedicated-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build dedicated windows-amd64
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T debug -d -8
+        ./waf.bat build
+
   build-dedicated-linux-i386:
     runs-on: ubuntu-18.04
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a0742c16..3a99a7f2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -40,3 +40,17 @@ jobs:
         cd out
         $env:Path = "bin";
         ./unittest.exe
+
+  tests-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run tests windows-amd64
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T release --tests --prefix=out/ -8
+        ./waf.bat install
+        cd out
+        $env:Path = "bin";
+        ./unittest.exe