diff --git a/shippable.yml b/shippable.yml
index 4f6e573671d..bb7b4f63a07 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -62,6 +62,13 @@ matrix:
     - env: T=windows/2016/6
     - env: T=windows/2019/6
 
+    - env: T=windows/2008/7
+    - env: T=windows/2008-R2/7
+    - env: T=windows/2012/7
+    - env: T=windows/2012-R2/7
+    - env: T=windows/2016/7
+    - env: T=windows/2019/7
+
     - env: T=network
 
     - env: T=osx/10.11/1
diff --git a/test/integration/targets/win_certificate_store/aliases b/test/integration/targets/win_certificate_store/aliases
index 4cd27b3cb2f..6036e173f1a 100644
--- a/test/integration/targets/win_certificate_store/aliases
+++ b/test/integration/targets/win_certificate_store/aliases
@@ -1 +1 @@
-shippable/windows/group1
+shippable/windows/group7
diff --git a/test/integration/targets/win_credential/aliases b/test/integration/targets/win_credential/aliases
index 4c08975b17d..6036e173f1a 100644
--- a/test/integration/targets/win_credential/aliases
+++ b/test/integration/targets/win_credential/aliases
@@ -1 +1 @@
-shippable/windows/group6
+shippable/windows/group7
diff --git a/test/integration/targets/win_dns_record/aliases b/test/integration/targets/win_dns_record/aliases
index 9ad549d4a68..6f44e1916f7 100644
--- a/test/integration/targets/win_dns_record/aliases
+++ b/test/integration/targets/win_dns_record/aliases
@@ -1,3 +1,3 @@
-shippable/windows/group2
+shippable/windows/group7
 skip/windows/2008
 skip/windows/2008-R2
diff --git a/test/integration/targets/win_package/aliases b/test/integration/targets/win_package/aliases
index 3cf5b97e805..6036e173f1a 100644
--- a/test/integration/targets/win_package/aliases
+++ b/test/integration/targets/win_package/aliases
@@ -1 +1 @@
-shippable/windows/group3
+shippable/windows/group7
diff --git a/test/integration/targets/win_partition/aliases b/test/integration/targets/win_partition/aliases
index 3fac36743f2..6f44e1916f7 100644
--- a/test/integration/targets/win_partition/aliases
+++ b/test/integration/targets/win_partition/aliases
@@ -1,3 +1,3 @@
-shippable/windows/group6
+shippable/windows/group7
 skip/windows/2008
 skip/windows/2008-R2
diff --git a/test/integration/targets/win_scheduled_task/aliases b/test/integration/targets/win_scheduled_task/aliases
index 4f4664b6858..6036e173f1a 100644
--- a/test/integration/targets/win_scheduled_task/aliases
+++ b/test/integration/targets/win_scheduled_task/aliases
@@ -1 +1 @@
-shippable/windows/group5
+shippable/windows/group7
diff --git a/test/integration/targets/win_service/aliases b/test/integration/targets/win_service/aliases
index f687b0e0efa..71fee861933 100644
--- a/test/integration/targets/win_service/aliases
+++ b/test/integration/targets/win_service/aliases
@@ -1,2 +1,2 @@
-shippable/windows/group4
+shippable/windows/group7
 shippable/windows/smoketest
diff --git a/test/integration/targets/win_user/aliases b/test/integration/targets/win_user/aliases
index 4c08975b17d..6036e173f1a 100644
--- a/test/integration/targets/win_user/aliases
+++ b/test/integration/targets/win_user/aliases
@@ -1 +1 @@
-shippable/windows/group6
+shippable/windows/group7
diff --git a/test/integration/targets/win_user_profile/aliases b/test/integration/targets/win_user_profile/aliases
index 4cd27b3cb2f..6036e173f1a 100644
--- a/test/integration/targets/win_user_profile/aliases
+++ b/test/integration/targets/win_user_profile/aliases
@@ -1 +1 @@
-shippable/windows/group1
+shippable/windows/group7