diff --git a/unix.yaml b/Unix.yaml
similarity index 80%
rename from unix.yaml
rename to Unix.yaml
index 57fcd1e..46629d8 100644
--- a/unix.yaml
+++ b/Unix.yaml
@@ -15,3 +15,6 @@
     - role: llvm
     - role: nodejs
     - role: python
+
+    - role: wsl
+      when: '"WSL" in ansible_kernel'
diff --git a/WSL.yaml b/WSL.yaml
new file mode 100644
index 0000000..8d4672f
--- /dev/null
+++ b/WSL.yaml
@@ -0,0 +1,3 @@
+---
+- import_playbook: Unix.yaml
+- import_playbook: Windows.yaml
diff --git a/Windows.yaml b/Windows.yaml
index 779e46d..b78e6ee 100644
--- a/Windows.yaml
+++ b/Windows.yaml
@@ -1,14 +1,4 @@
 ---
-- import_playbook: unix.yaml
-
-- hosts: localhost
-
-  # FIXME: Roles which depend on the win_git module can't be in the same
-  # playbook on the first run because the wsl role hasn't added the win_git
-  # module to the modules path yet.
-  roles:
-    - role: wsl
-
 - hosts: windows
 
   roles: