diff --git a/kitchen.yml b/kitchen.yml
index 085dd70..6271cec 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -22,15 +22,24 @@ suites:
 - name: default
   run_list:
   - recipe[test::default]
+  attributes:
+    chef-server:
+      accept_license: true
 - name: no-fqdn
   run_list:
   - recipe[test::no-fqdn]
   driver:
     network:
       - ['private_network', {ip: '192.168.243.2'}]
+  attributes:
+    chef-server:
+      accept_license: true
 - name: add-ons-no-fqdn
   run_list:
   - recipe[test::add-ons-no-fqdn]
   driver:
     network:
       - ['private_network', {ip: '192.168.243.3'}]
+  attributes:
+    chef-server:
+      accept_license: true
diff --git a/recipes/addons.rb b/recipes/addons.rb
index fa93e3e..62108cb 100644
--- a/recipes/addons.rb
+++ b/recipes/addons.rb
@@ -18,7 +18,7 @@
 #
 node['chef-server']['addons'].each do |addon, ver|
   chef_ingredient addon do
-    accept_license node['chef-server']['accept_license'] unless node['chef-server']['accept_license'].nil?
+    accept_license node['chef-server']['accept_license']
     notifies :reconfigure, "chef_ingredient[#{addon}]"
     version ver unless ver.nil?
   end
diff --git a/recipes/default.rb b/recipes/default.rb
index ccb96a7..ea154e8 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -30,6 +30,7 @@
   extend ChefServerCookbook::Helpers
   version node['chef-server']['version'] unless node['chef-server']['version'].nil?
   package_source node['chef-server']['package_source']
+  accept_license node['chef-server']['accept_license']
   config <<-EOS
 topology "#{node['chef-server']['topology']}"
 #{"api_fqdn \"#{node['chef-server']['api_fqdn']}\"" if api_fqdn_available?}