diff --git a/.github/workflows/maven.yml b/.github/workflows/ubuntu_java-11.yml
similarity index 89%
rename from .github/workflows/maven.yml
rename to .github/workflows/ubuntu_java-11.yml
index c667a88d..0418c4b3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/ubuntu_java-11.yml
@@ -1,4 +1,4 @@
-name: Java CI with Maven
+name: Build and test on latest Ubuntu and Java 11
 
 on:
   push:
diff --git a/.github/workflows/windows_java-11.yml b/.github/workflows/windows_java-11.yml
new file mode 100644
index 00000000..471f774a
--- /dev/null
+++ b/.github/workflows/windows_java-11.yml
@@ -0,0 +1,27 @@
+name: Build and test on latest Windows and Java 11
+
+on:
+  push:
+    branches: master
+  pull_request:
+    branches: master
+  workflow_dispatch:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Grant execute permission for mvnw
+      run: chmod +x mvnw
+    - name: Build with Maven
+      run: ./mvnw -B package --file pom.xml
+