diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8ee648..2d31cda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,21 +95,31 @@ jobs:
   #         chmod a+x builder
   #         ./builder build -p ${{ env.PACKAGE_NAME }} --target=linux-${{ matrix.arch }} --spec=downstream
 
-  # windows-vc16:
-  #   runs-on: windows-latest
-  #   strategy:
-  #     matrix:
-  #       arch: [x64]
-  #   steps:
-  #   - uses: ilammy/msvc-dev-cmd@v1
-  #     with:
-  #       arch: ${{ matrix.arch }}
-  #       uwp: false
-  #       spectre: true
-  #   - name: Build ${{ env.PACKAGE_NAME }} + consumers
-  #     run: |
-  #       python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
-  #       python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
+  windows-vc16:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        arch: [x64]
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - id: setup-php-sdk
+      uses: cmb69/setup-php-sdk@v0.6
+      with:
+        version: '8.0'
+        arch: x64
+        ts: ts
+    - uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+        toolset: ${{steps.setup-php-sdk.outputs.toolset}}
+    - name: Build ${{ env.PACKAGE_NAME }} + consumers
+      run: |
+        phpize
+        .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared
+        nmake
+        .\dev-scripts\run_tests
 
   # windows-vc14:
   #   runs-on: windows-latest
diff --git a/dev-scripts/run_tests.bat b/dev-scripts/run_tests.bat
index 179589f..0eed5c6 100644
--- a/dev-scripts/run_tests.bat
+++ b/dev-scripts/run_tests.bat
@@ -1,6 +1,18 @@
-
 @echo on
+setlocal
 
-cd ..
+REM Run command to get composer_dir
+set "composer_dir="
+for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i"
 
-%PHP_BINARY% -c php-win.ini vendor/bin/phpunit tests --debug
+REM Check if composer_dir was found
+if "%composer_dir%"=="" (
+  echo No composer found.
+  exit /b 1
+) else (
+  cd ..
+  php -c php-win.ini %composer_dir% update
+  php -c php-win.ini vendor/bin/phpunit tests --debug
+)
+
+endlocal
\ No newline at end of file
diff --git a/php-win.ini b/php-win.ini
index c6d7db8..86938f2 100644
--- a/php-win.ini
+++ b/php-win.ini
@@ -1,2 +1,5 @@
-extension=php_awscrt.dll
+; only works on 64bit build
+extension=x64\Release\php_awscrt.dll
+
 extension=php_openssl.dll
+extension=php_mbstring.dll