diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dbae95c6..a1e8f42f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,6 +66,31 @@ jobs:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
 
+  integration-windows:
+    needs: [mdl, yamllint, delivery]
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        os:
+          - 'windows-latest'
+        suite:
+          - 'default'
+      fail-fast: false
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@master
+      - name: Install Chef
+        uses: actionshub/chef-install@master
+      - name: test-kitchen
+        uses: actionshub/test-kitchen@master
+        env:
+          CHEF_LICENSE: accept-no-persist
+          KITCHEN_LOCAL_YAML: kitchen.exec.yml
+        with:
+          suite: ${{ matrix.suite }}
+          os: ${{ matrix.os }}
+
   integration-macos:
     needs: [mdl, yamllint, delivery]
     runs-on: macos-latest
@@ -90,3 +115,12 @@ jobs:
         with:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
+
+  final:
+    runs-on: ubuntu-latest
+    needs: [integration, integration-windows, integration-macos]
+    steps:
+      - run: echo ${{needs.integration.outputs}}
+      - run: echo ${{needs.integration-windows.outputs}}
+      - run: echo ${{needs.integration-macos.outputs}}
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7643d5d2..29c309d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ This file is used to list changes made in each version of the users cookbook.
 
 ## Unreleased
 
+- Fix issues on Windows and add CI testing
+
 ## 8.1.1 - *2021-08-30*
 
 - Standardise files with files in sous-chefs/repo-management
diff --git a/kitchen.exec.yml b/kitchen.exec.yml
index 5e1b71a8..ba7b2a96 100644
--- a/kitchen.exec.yml
+++ b/kitchen.exec.yml
@@ -4,3 +4,4 @@ transport: { name: exec }
 
 platforms:
   - name: macos-latest
+  - name: windows-latest
diff --git a/kitchen.yml b/kitchen.yml
index 66cd5a1e..5e39026c 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -24,6 +24,16 @@ platforms:
   - name: opensuse-leap-15
   - name: ubuntu-18.04
   - name: ubuntu-20.04
+  - name: windows-2019
+    driver:
+      gui: false
+      box: tas50/windows_2019
+      customize:
+        cpus: 2
+        memory: 4096
+    transport:
+      name: winrm
+      elevated: true
 
 suites:
   - name: default