diff --git a/README.rst b/README.rst
index aa12c341..202e6a52 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,4 @@
+
 .. image:: https://raw.githubusercontent.com/ClearcodeHQ/pytest-elasticsearch/master/logo.png
     :width: 100px
     :height: 100px
@@ -105,6 +106,12 @@ You can pick which you prefer, but remember that these settings are handled in t
      - pytest.ini option
      - Noop process fixture
      - Default
+   * - Elasticsearch executable
+     - executable
+     - --elasticsearch_executable
+     - elasticsearch_executable
+     -
+     - /usr/share/elasticsearch/bin/elasticsearch
    * - logs directory
      - logsdir
      - --elasticsearch-logsdir
diff --git a/src/pytest_elasticsearch/factories.py b/src/pytest_elasticsearch/factories.py
index b01a4b30..37f997db 100644
--- a/src/pytest_elasticsearch/factories.py
+++ b/src/pytest_elasticsearch/factories.py
@@ -47,7 +47,7 @@ def return_config(request):
     return config
 
 
-def elasticsearch_proc(executable='/usr/share/elasticsearch/bin/elasticsearch',
+def elasticsearch_proc(executable=None,
                        host=None, port=-1, transport_tcp_port=None,
                        cluster_name=None, network_publish_host=None,
                        index_store_type=None, logs_prefix=None,
@@ -84,7 +84,7 @@ def elasticsearch_proc_fixture(request):
         """Elasticsearch process starting fixture."""
         config = return_config(request)
         elasticsearch_host = host or config['host']
-        executable = config['executable'] or executable
+        elasticsearch_executable = executable or config['executable']
 
         elasticsearch_port = get_port(port) or get_port(config['port'])
         elasticsearch_transport_port = get_port(transport_tcp_port) or \
@@ -112,7 +112,7 @@ def elasticsearch_proc_fixture(request):
             gettempdir(), 'elasticsearch_{0}_tmp'.format(elasticsearch_port))
 
         elasticsearch_executor = ElasticSearchExecutor(
-            executable,
+            elasticsearch_executable,
             elasticsearch_host,
             elasticsearch_port,
             elasticsearch_transport_port,
diff --git a/src/pytest_elasticsearch/plugin.py b/src/pytest_elasticsearch/plugin.py
index d35a0a41..bfc387cf 100644
--- a/src/pytest_elasticsearch/plugin.py
+++ b/src/pytest_elasticsearch/plugin.py
@@ -52,7 +52,7 @@ def pytest_addoption(parser):
 
     parser.addini(
         name='elasticsearch_executable',
-        help=_help_host,
+        help=_help_executable,
         default='/usr/share/elasticsearch/bin/elasticsearch'
     )
 
@@ -110,8 +110,7 @@ def pytest_addoption(parser):
         '--elasticsearch_executable',
         action='store',
         dest='elasticsearch_executable',
-        help=_help_host,
-        default='/usr/share/elasticsearch/bin/elasticsearch'
+        help=_help_executable,
     )
 
     parser.addoption(