diff --git a/lib/vagrant/provisioners/chef_client.rb b/lib/vagrant/provisioners/chef_client.rb
index f3661acf4..b513f0d4e 100644
--- a/lib/vagrant/provisioners/chef_client.rb
+++ b/lib/vagrant/provisioners/chef_client.rb
@@ -78,7 +78,7 @@ module Vagrant
       end
 
       def setup_server_config
-        setup_config("chef_server_client", "client.rb", {
+        setup_config("provisioners/chef_client/client", "client.rb", {
           :node_name => config.node_name,
           :chef_server_url => config.chef_server_url,
           :validation_client_name => config.validation_client_name,
diff --git a/lib/vagrant/provisioners/chef_solo.rb b/lib/vagrant/provisioners/chef_solo.rb
index ac0a72209..c77282540 100644
--- a/lib/vagrant/provisioners/chef_solo.rb
+++ b/lib/vagrant/provisioners/chef_solo.rb
@@ -113,7 +113,7 @@ module Vagrant
         roles_path = guest_paths(@role_folders).first
         data_bags_path = guest_paths(@data_bags_folders).first
 
-        setup_config("chef_solo_solo", "solo.rb", {
+        setup_config("provisioners/chef_solo/solo.erb", "solo.rb", {
           :node_name => config.node_name,
           :provisioning_path => config.provisioning_path,
           :cookbooks_path => cookbooks_path,
diff --git a/templates/chef_server_client.erb b/templates/provisioners/chef_client/client.erb
similarity index 100%
rename from templates/chef_server_client.erb
rename to templates/provisioners/chef_client/client.erb
diff --git a/templates/chef_solo_solo.erb b/templates/provisioners/chef_solo/solo.erb
similarity index 100%
rename from templates/chef_solo_solo.erb
rename to templates/provisioners/chef_solo/solo.erb