diff --git a/test/integration/host_vars/windows-2016-English-Full-Base b/test/integration/host_vars/windows-2016
similarity index 100%
rename from test/integration/host_vars/windows-2016-English-Full-Base
rename to test/integration/host_vars/windows-2016
diff --git a/test/runner/completion/windows.txt b/test/runner/completion/windows.txt
index 54c745553b..6924be4e13 100644
--- a/test/runner/completion/windows.txt
+++ b/test/runner/completion/windows.txt
@@ -1,7 +1,5 @@
-2008-SP2
-2008-R2_SP1
-2012-RTM
-2012-R2_RTM
-2016-English-Full-Base
-2016-English-Full-Containers
-2016-English-Nano-Base
+2008
+2008-R2
+2012
+2012-R2
+2016
diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh
index c35750be79..b7a8bee600 100755
--- a/test/utils/shippable/windows.sh
+++ b/test/utils/shippable/windows.sh
@@ -29,18 +29,18 @@ if [ -s /tmp/windows.txt ] || [ "${CHANGED:+$CHANGED}" == "" ]; then
     echo "Running Windows integration tests for multiple versions concurrently."
 
     platforms=(
-        --windows 2008-SP2
-        --windows 2008-R2_SP1
-        --windows 2012-RTM
-        --windows 2012-R2_RTM
-        --windows 2016-English-Full-Base
+        --windows 2008
+        --windows 2008-R2
+        --windows 2012
+        --windows 2012-R2
+        --windows 2016
     )
 else
     echo "No changes requiring integration tests specific to Windows were detected."
     echo "Running Windows integration tests for a single version only."
 
     platforms=(
-        --windows 2012-R2_RTM
+        --windows 2012-R2
     )
 fi