diff --git a/shippable.yml b/shippable.yml
index 6238e33fbb4..efe6f8eff47 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -24,6 +24,7 @@ matrix:
 
     - env: TEST=windows/1
     - env: TEST=windows/2
+    - env: TEST=windows/3
 
     - env: TEST=network
 
diff --git a/test/integration/targets/win_hotfix/aliases b/test/integration/targets/win_hotfix/aliases
index 10e03fc2bf7..ee0ed5974e9 100644
--- a/test/integration/targets/win_hotfix/aliases
+++ b/test/integration/targets/win_hotfix/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group2
diff --git a/test/integration/targets/win_iis_webapppool/aliases b/test/integration/targets/win_iis_webapppool/aliases
index 10e03fc2bf7..ee0ed5974e9 100644
--- a/test/integration/targets/win_iis_webapppool/aliases
+++ b/test/integration/targets/win_iis_webapppool/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group2
diff --git a/test/integration/targets/win_lineinfile/aliases b/test/integration/targets/win_lineinfile/aliases
index ee0ed5974e9..10e03fc2bf7 100644
--- a/test/integration/targets/win_lineinfile/aliases
+++ b/test/integration/targets/win_lineinfile/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group1
diff --git a/test/integration/targets/win_power_plan/aliases b/test/integration/targets/win_power_plan/aliases
index 1ab64312711..c6d61981670 100644
--- a/test/integration/targets/win_power_plan/aliases
+++ b/test/integration/targets/win_power_plan/aliases
@@ -1 +1 @@
-windows/ci/group2
\ No newline at end of file
+windows/ci/group3
diff --git a/test/integration/targets/win_rabbitmq_plugin/aliases b/test/integration/targets/win_rabbitmq_plugin/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_rabbitmq_plugin/aliases
+++ b/test/integration/targets/win_rabbitmq_plugin/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3
diff --git a/test/integration/targets/win_region/aliases b/test/integration/targets/win_region/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_region/aliases
+++ b/test/integration/targets/win_region/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3
diff --git a/test/integration/targets/win_regmerge/aliases b/test/integration/targets/win_regmerge/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_regmerge/aliases
+++ b/test/integration/targets/win_regmerge/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_route/aliases b/test/integration/targets/win_route/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_route/aliases
+++ b/test/integration/targets/win_route/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_say/aliases b/test/integration/targets/win_say/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_say/aliases
+++ b/test/integration/targets/win_say/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3
diff --git a/test/integration/targets/win_scheduled_task/aliases b/test/integration/targets/win_scheduled_task/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_scheduled_task/aliases
+++ b/test/integration/targets/win_scheduled_task/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_security_policy/aliases b/test/integration/targets/win_security_policy/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_security_policy/aliases
+++ b/test/integration/targets/win_security_policy/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_setup/aliases b/test/integration/targets/win_setup/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_setup/aliases
+++ b/test/integration/targets/win_setup/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_share/aliases b/test/integration/targets/win_share/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_share/aliases
+++ b/test/integration/targets/win_share/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_shortcut/aliases b/test/integration/targets/win_shortcut/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_shortcut/aliases
+++ b/test/integration/targets/win_shortcut/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3
diff --git a/test/integration/targets/win_slurp/aliases b/test/integration/targets/win_slurp/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_slurp/aliases
+++ b/test/integration/targets/win_slurp/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_stat/aliases b/test/integration/targets/win_stat/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_stat/aliases
+++ b/test/integration/targets/win_stat/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3
diff --git a/test/integration/targets/win_tempfile/aliases b/test/integration/targets/win_tempfile/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_tempfile/aliases
+++ b/test/integration/targets/win_tempfile/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_timezone/aliases b/test/integration/targets/win_timezone/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_timezone/aliases
+++ b/test/integration/targets/win_timezone/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_toast/aliases b/test/integration/targets/win_toast/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_toast/aliases
+++ b/test/integration/targets/win_toast/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3
diff --git a/test/integration/targets/win_unzip/aliases b/test/integration/targets/win_unzip/aliases
index ee0ed5974e9..10e03fc2bf7 100644
--- a/test/integration/targets/win_unzip/aliases
+++ b/test/integration/targets/win_unzip/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group1
diff --git a/test/integration/targets/win_user/aliases b/test/integration/targets/win_user/aliases
index ee0ed5974e9..10e03fc2bf7 100644
--- a/test/integration/targets/win_user/aliases
+++ b/test/integration/targets/win_user/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group1
diff --git a/test/integration/targets/win_user_right/aliases b/test/integration/targets/win_user_right/aliases
index 10e03fc2bf7..c6d61981670 100644
--- a/test/integration/targets/win_user_right/aliases
+++ b/test/integration/targets/win_user_right/aliases
@@ -1 +1 @@
-windows/ci/group1
+windows/ci/group3
diff --git a/test/integration/targets/win_wakeonlan/aliases b/test/integration/targets/win_wakeonlan/aliases
index ee0ed5974e9..c6d61981670 100644
--- a/test/integration/targets/win_wakeonlan/aliases
+++ b/test/integration/targets/win_wakeonlan/aliases
@@ -1 +1 @@
-windows/ci/group2
+windows/ci/group3