diff --git a/handlers/elasticsearch-restart.yml b/handlers/elasticsearch-restart.yml
new file mode 100644
index 0000000..24d444b
--- /dev/null
+++ b/handlers/elasticsearch-restart.yml
@@ -0,0 +1,8 @@
+---
+
+- name: Restart Elasticsearch
+  service: name={{instance_init_script | basename}} state=restarted enabled=yes
+  when: es_restart_on_change and es_start_service and ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))
+
+- name: Wait for elasticsearch to startup
+  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
index ff07a08..310e9f7 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -3,8 +3,7 @@
 
 # Restart service and ensure it is enabled
 - name: restart elasticsearch
-  service: name={{instance_init_script | basename}} state=restarted enabled=yes
-  when: es_restart_on_change and es_start_service and ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))
+  include: ./handlers/elasticsearch-restart.yml
 
 # All security specific actions should go in here
 - name: activate-security
diff --git a/templates/elasticsearch.j2 b/templates/elasticsearch.j2
index 0305e4e..0c7f4a6 100644
--- a/templates/elasticsearch.j2
+++ b/templates/elasticsearch.j2
@@ -59,8 +59,8 @@ MAX_OPEN_FILES={{es_max_open_files}}
 # in elasticsearch.yml (ES_HEAP_SIZE  must also be set).
 # When using Systemd, the LimitMEMLOCK property must be set
 # in /usr/lib/systemd/system/elasticsearch.service
-{% if m_lock_enabled %}
 #MAX_LOCKED_MEMORY=
+{% if m_lock_enabled %}
 MAX_LOCKED_MEMORY=unlimited
 {% endif %}
 
diff --git a/test/integration/multi.yml b/test/integration/multi.yml
index 8b1ddd1..6bfa96c 100644
--- a/test/integration/multi.yml
+++ b/test/integration/multi.yml
@@ -3,9 +3,10 @@
 - name: Elasticsearch Multi tests
   hosts: localhost
   roles:
-    - { role: elasticsearch, es_instance_name: "master", es_data_dirs: ["/opt/elasticsearch/master"], es_heap_size: "1g", es_config: { discovery.zen.ping.unicast.hosts: "localhost:9300", http.port: 9200, transport.tcp.port: 9300, node.data: false, node.master: true, bootstrap.memory_lock: true } }
+    - { role: elasticsearch, es_instance_name: "master", es_data_dirs: ["/opt/elasticsearch/master"], es_config: { discovery.zen.ping.unicast.hosts: "localhost:9300", http.port: 9200, transport.tcp.port: 9300, node.data: false, node.master: true, bootstrap.memory_lock: true } }
     - { role: elasticsearch, es_instance_name: "node1", es_data_dirs: "/opt/elasticsearch/data-1,/opt/elasticsearch/data-2", es_config: { discovery.zen.ping.unicast.hosts: "localhost:9300", http.port: 9201, transport.tcp.port: 9301, node.data: true, node.master: false } }
   vars:
     es_scripts: true
     es_templates: true
+    es_heap_size: "1g"
 #Plugins installed for this test are specified in .kitchen.yml under suite
\ No newline at end of file
diff --git a/test/integration/package.yml b/test/integration/package.yml
index ef59d37..015f08b 100644
--- a/test/integration/package.yml
+++ b/test/integration/package.yml
@@ -6,4 +6,5 @@
   vars:
     es_scripts: true
     es_templates: true
+    es_heap_size: "1g"
 #Plugins installed for this test are specified in .kitchen.yml under suite
\ No newline at end of file
diff --git a/test/integration/standard.yml b/test/integration/standard.yml
index fc5798f..6f978de 100644
--- a/test/integration/standard.yml
+++ b/test/integration/standard.yml
@@ -4,4 +4,5 @@
   roles:
     - { role: elasticsearch, es_instance_name: "node1" }
   vars:
-    es_use_repository: "true"
\ No newline at end of file
+    es_use_repository: "true"
+    es_heap_size: "1g"
\ No newline at end of file
diff --git a/test/integration/xpack.yml b/test/integration/xpack.yml
index 3826ad9..39099ba 100644
--- a/test/integration/xpack.yml
+++ b/test/integration/xpack.yml
@@ -6,6 +6,7 @@
     "xpack.security.authc.realms.file1.type": "file","xpack.security.authc.realms.file1.order": 0, "xpack.security.authc.realms.native1.type": "native","xpack.security.authc.realms.native1.order": 1 },
     es_instance_name: "security_node" }
   vars:
+    es_heap_size: "1g"
     es_templates: true
     es_enable_xpack: true
     es_xpack_license: "{{ lookup('file', '/tmp/license.json')  }}"