diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index 5d17c927..580b080c 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length
-            title: 'ci(kitchen+travis): use bootstrapped `amazonlinux-1` images'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/94'
+            title: 'feat(kitchen): implement Windows testing using `kitchen-vagrant`'
+            body: '* Checked using https://github.com/myii/ssf-formula/pull/81'
             # yamllint enable rule:line-length
           github:
             owner: 'saltstack-formulas'
diff --git a/ssf/files/default/inspec/inspec.yml b/ssf/files/default/inspec/inspec.yml
index ba405577..344642c7 100644
--- a/ssf/files/default/inspec/inspec.yml
+++ b/ssf/files/default/inspec/inspec.yml
@@ -26,5 +26,5 @@ depends:
 {%- endif %}
 supports:
 {%- for platform in suite.inspec_yml.supports %}
-  - platform-name: {{ platform }}
+  - {{ 'platform-name' if platform != 'windows' else 'platform' }}: {{ platform }}
 {%- endfor %}
diff --git a/ssf/files/tofs_openvpn-formula/Gemfile b/ssf/files/tofs_openvpn-formula/Gemfile
new file mode 100644
index 00000000..b609bb1d
--- /dev/null
+++ b/ssf/files/tofs_openvpn-formula/Gemfile
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'inspec'
+gem 'kitchen-docker', '>= 2.9'
+gem 'kitchen-inspec', '>= 1.1'
+gem 'kitchen-salt', '>= 0.6.0'
+gem 'rspec-retry'
+
+group :vagrant do
+  gem 'kitchen-vagrant'
+end
diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
index 931f48a5..00a3ec47 100644
--- a/ssf/formulas.yaml
+++ b/ssf/formulas.yaml
@@ -1179,6 +1179,17 @@ ssf:
             inspec_yml:
               summary: >-
                 Verify that the openvpn formula is setup and configured correctly
+              supports:
+                - debian
+                - ubuntu
+                - centos
+                - fedora
+                - opensuse
+                - suse
+                - freebsd
+                - amazon
+                - arch
+                - windows
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/default.sls'
@@ -1195,7 +1206,14 @@ ssf:
           - [centos       ,   7   ,   2018.3,      2,         default]
           - [opensuse/leap,  15.1 ,   2018.3,      2,         default]
           - [centos       ,   6   ,   2017.7,      2,         default]
-        travis: *travis_do_not_use_single_job_for_linters
+        rubocop:
+          Cops:
+            Metrics/BlockLength:
+              Max: 36
+        yamllint:
+          ignore:
+            additional:
+              - test/salt/pillar/default.sls
       semrel_files: *semrel_files_default
     php:
       context: