diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
index 7d0edba7..4adb3f1f 100644
--- a/lib/beaker-hostgenerator/data.rb
+++ b/lib/beaker-hostgenerator/data.rb
@@ -813,6 +813,16 @@ def osinfo
                           'locale' => 'fr',
                         },
                       },
+                      'windowsfips2016-6432' => {
+                        general: {
+                          'platform' => 'windows-2016-64',
+                          'packaging_platform' => 'windowsfips-2016-x64',
+                          'ruby_arch' => 'x64',
+                        },
+                        vmpooler: {
+                          'template' => 'win-2016-fips-x86_64',
+                        },
+                      },
                       'windows2019-64' => {
                         general: {
                           'platform' => 'windows-2019-64',
diff --git a/test/fixtures/generated/default/windowsfips2016-6432c b/test/fixtures/generated/default/windowsfips2016-6432c
new file mode 100644
index 00000000..bee0e129
--- /dev/null
+++ b/test/fixtures/generated/default/windowsfips2016-6432c
@@ -0,0 +1,17 @@
+---
+arguments_string: windowsfips2016-6432c
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windowsfips2016-6432-1:
+      platform: windows-2016-64
+      packaging_platform: windowsfips-2016-x64
+      ruby_arch: x64
+      template: win-2016-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/fedora28-32c-windowsfips2016-6432-fedora28-32d b/test/fixtures/generated/multiplatform/fedora28-32c-windowsfips2016-6432-fedora28-32d
new file mode 100644
index 00000000..0bc410c0
--- /dev/null
+++ b/test/fixtures/generated/multiplatform/fedora28-32c-windowsfips2016-6432-fedora28-32d
@@ -0,0 +1,30 @@
+---
+arguments_string: fedora28-32c-windowsfips2016-6432-fedora28-32d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora28-32-1:
+      platform: fedora-28-i386
+      hypervisor: vmpooler
+      template: fedora-28-i386
+      roles:
+      - agent
+      - dashboard
+    windowsfips2016-6432-1:
+      platform: windows-2016-64
+      packaging_platform: windowsfips-2016-x64
+      ruby_arch: x64
+      template: win-2016-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    fedora28-32-2:
+      platform: fedora-28-i386
+      hypervisor: vmpooler
+      template: fedora-28-i386
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/windowsfips2016-6432c-fedora28-32-windowsfips2016-6432d b/test/fixtures/generated/multiplatform/windowsfips2016-6432c-fedora28-32-windowsfips2016-6432d
new file mode 100644
index 00000000..5a91b25c
--- /dev/null
+++ b/test/fixtures/generated/multiplatform/windowsfips2016-6432c-fedora28-32-windowsfips2016-6432d
@@ -0,0 +1,32 @@
+---
+arguments_string: windowsfips2016-6432c-fedora28-32-windowsfips2016-6432d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windowsfips2016-6432-1:
+      platform: windows-2016-64
+      packaging_platform: windowsfips-2016-x64
+      ruby_arch: x64
+      template: win-2016-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+    fedora28-32-1:
+      platform: fedora-28-i386
+      hypervisor: vmpooler
+      template: fedora-28-i386
+      roles:
+      - agent
+    windowsfips2016-6432-2:
+      platform: windows-2016-64
+      packaging_platform: windowsfips-2016-x64
+      ruby_arch: x64
+      template: win-2016-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-0/windowsfips2016-6432c b/test/fixtures/generated/osinfo-version-0/windowsfips2016-6432c
new file mode 100644
index 00000000..2a439e62
--- /dev/null
+++ b/test/fixtures/generated/osinfo-version-0/windowsfips2016-6432c
@@ -0,0 +1,17 @@
+---
+arguments_string: "--osinfo-version 0 windowsfips2016-6432c"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windowsfips2016-6432-1:
+      platform: windows-2016-64
+      packaging_platform: windowsfips-2016-x64
+      ruby_arch: x64
+      template: win-2016-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-1/windowsfips2016-6432c b/test/fixtures/generated/osinfo-version-1/windowsfips2016-6432c
new file mode 100644
index 00000000..5a6902ee
--- /dev/null
+++ b/test/fixtures/generated/osinfo-version-1/windowsfips2016-6432c
@@ -0,0 +1,17 @@
+---
+arguments_string: "--osinfo-version 1 windowsfips2016-6432c"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    windowsfips2016-6432-1:
+      platform: windows-2016-64
+      packaging_platform: windowsfips-2016-x64
+      ruby_arch: x64
+      template: win-2016-fips-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: