diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8449694c..6eec22f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,7 @@ jobs:
       # Run tests on each OS/Python combination
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        # TODO: Add windows-latest when gpg issues are solved
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         toxenv: [py]
 
         include:
@@ -63,10 +62,9 @@ jobs:
             brew install softhsm
             echo "PYKCS11LIB=$(brew --prefix softhsm)/lib/softhsm/libsofthsm2.so" >> $GITHUB_ENV
 
-          # TODO: Uncomment when testing on Windows
-          # elif [ "$RUNNER_OS" == "Windows" ]; then
-          #   choco install softhsm.install
-          #   echo "PYKCS11LIB=C:\SoftHSM2\lib\softhsm2-x64.dll" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "Windows" ]; then
+            choco install softhsm.install
+            echo "PYKCS11LIB=C:\SoftHSM2\lib\softhsm2-x64.dll" >> $GITHUB_ENV
 
           else
               echo "$RUNNER_OS not supported"