diff --git a/defaults/main.yml b/defaults/main.yml
index 2906571..40b88e0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,6 +6,7 @@ es_use_repository: true
 es_start_service: true
 es_plugins_reinstall: false
 es_scripts: false
+es_scripts_src: scripts
 es_templates: false
 es_user: elasticsearch
 es_group: elasticsearch
diff --git a/tasks/elasticsearch-scripts.yml b/tasks/elasticsearch-scripts.yml
index eb55422..554bf8e 100644
--- a/tasks/elasticsearch-scripts.yml
+++ b/tasks/elasticsearch-scripts.yml
@@ -1,12 +1,12 @@
 ---
 
-- set_fact: es_script_dir={{ es_log_dir }}/{{inventory_hostname}}-{{ es_instance_name }}
+- set_fact: es_script_dir={{ es_conf_dir }}/{{es_instance_name}}/scripts
 
 - set_fact: es_script_dir={{es_config['path.scripts']}}
-  when: es_config['path.scripts'] is not defined
+  when: es_config['path.scripts'] is defined
 
 - name: Create script dir
   file: state=directory path={{ es_script_dir }} owner={{ es_user }} group={{ es_group }}
 
 - name: Copy scripts to elasticsearch
-  copy: src=scripts dest={{ es_scripts_dir }}
+  copy: src={{es_scripts_src}} dest={{ es_script_dir }}
\ No newline at end of file
diff --git a/test/integration/package.yml b/test/integration/package.yml
index 9c7db94..9adbfcc 100644
--- a/test/integration/package.yml
+++ b/test/integration/package.yml
@@ -4,4 +4,5 @@
   roles:
     - { role: elasticsearch, es_config: { "discovery.zen.ping.multicast.enabled": true }, es_instance_name: "node1" }
   vars:
-    es_scripts: true
\ No newline at end of file
+    es_scripts: true
+    es_scripts_src: "./test/package/scripts/"
\ No newline at end of file
diff --git a/test/integration/package/serverspec/default_spec.rb b/test/integration/package/serverspec/default_spec.rb
index 6dc47a3..b01bc1c 100644
--- a/test/integration/package/serverspec/default_spec.rb
+++ b/test/integration/package/serverspec/default_spec.rb
@@ -18,6 +18,11 @@ context "basic tests" do
     it { should be_file }
   end
 
+  describe file('/etc/elasticsearch/node1/scripts') do
+    it { should be_directory }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
   describe 'Node listening' do
     it 'listening in port 9200' do
       expect(port 9200).to be_listening