diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index f202c35..d6588be 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -1,6 +1,3 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-
 name: Python application
 
 on:
@@ -20,24 +17,55 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ["3.9", "3.10", "3.11"]
-        
+
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.9, 3.10, 3.11
+    
+    - name: Set up Python
       uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+
+    - name: Install dependencies (Linux and macOS)
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
+      shell: bash
+      if: runner.os != 'Windows'
+
+    - name: Install dependencies (Windows)
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if (Test-Path requirements.txt) { pip install -r requirements.txt }
+      shell: pwsh
+      if: runner.os == 'Windows'
+
+    - name: Lint with flake8 (Linux and macOS)
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      shell: bash
+      if: runner.os != 'Windows'
+
+    - name: Lint with flake8 on Windows
+      run: |
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      shell: pwsh
+      if: runner.os == 'Windows'
+
     - name: Test with pytest
       run: |
         pytest
+      shell: bash
+      if: runner.os != 'Windows'
+
+    - name: Test with pytest on Windows
+      run: |
+        pytest
+      shell: pwsh
+      if: runner.os == 'Windows'