diff --git a/object_templates/class_spec.erb b/object_templates/class_spec.erb
index 8a1a1d8e..3b086538 100644
--- a/object_templates/class_spec.erb
+++ b/object_templates/class_spec.erb
@@ -2,12 +2,6 @@
 
 require 'spec_helper'
 
-describe '<%= name %>' do
-  on_supported_os.each do |os, os_facts|
-    context "on #{os}" do
-      let(:facts) { os_facts }
-
-      it { is_expected.to compile }
-    end
-  end
+describe_on_supported_os '<%= name %>' do
+  it { is_expected.to compile }
 end
diff --git a/object_templates/defined_type_spec.erb b/object_templates/defined_type_spec.erb
index cd22cc08..0977cb2b 100644
--- a/object_templates/defined_type_spec.erb
+++ b/object_templates/defined_type_spec.erb
@@ -2,17 +2,11 @@
 
 require 'spec_helper'
 
-describe '<%= name %>' do
+describe_on_supported_os '<%= name %>' do
   let(:title) { 'namevar' }
   let(:params) do
     {}
   end
 
-  on_supported_os.each do |os, os_facts|
-    context "on #{os}" do
-      let(:facts) { os_facts }
-
-      it { is_expected.to compile }
-    end
-  end
+  it { is_expected.to compile }
 end