diff --git a/features/api/command/last_command_stopped.feature b/features/api/command/last_command_stopped.feature
index 769d61703..3fed725fd 100644
--- a/features/api/command/last_command_stopped.feature
+++ b/features/api/command/last_command_stopped.feature
@@ -70,7 +70,7 @@ Feature: Return last command stopped
 
   @requires-aruba-version-1
   Scenario: No command has been stopped
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     while [ true ]; do sleep 1; done
diff --git a/features/api/command/run.feature b/features/api/command/run.feature
index 9ae8cf46a..8db55ff1b 100644
--- a/features/api/command/run.feature
+++ b/features/api/command/run.feature
@@ -24,7 +24,7 @@ Feature: Run command
     Given I use a fixture named "cli-app"
 
   Scenario: Existing executable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 0
@@ -42,7 +42,7 @@ Feature: Run command
     Then the specs should all pass
 
   Scenario: Relative path to executable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 0
@@ -52,7 +52,7 @@ Feature: Run command
     require 'spec_helper'
 
     RSpec.describe 'Run command', :type => :aruba do
-      before(:each) { run('bin/cli') }
+      before(:each) { run('bin/aruba-test-cli') }
       it { expect(last_command_started).to be_successfully_executed }
     end
     """
@@ -60,7 +60,7 @@ Feature: Run command
     Then the specs should all pass
 
   Scenario: Non-existing executable
-    Given a file named "bin/cli" does not exist
+    Given a file named "bin/aruba-test-cli" does not exist
     And a file named "spec/run_spec.rb" with:
     """ruby
     require 'spec_helper'
@@ -79,7 +79,7 @@ Feature: Run command
     Otherwise methods like `#send_signal` don't work since they require the
     command to be running and have setup it's signal handler.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
  
@@ -129,7 +129,7 @@ Feature: Run command
     If you have got a "long running" command, you should consider using the
     `exit_timeout`-option.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -159,7 +159,7 @@ Feature: Run command
     If you commands with a long and short startup phases, you should consider
     using the `startup_wait_time`-option local to the `#run`-call.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/usr/bin/env bash
  
@@ -187,7 +187,7 @@ Feature: Run command
 
     while [ true ]; do sleep 0.2; done
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/usr/bin/env bash
 
@@ -238,7 +238,7 @@ Feature: Run command
     If you commands with a long and short startup phases, you should consider
     using the `startup_wait_time`-option local to the `#run`-call.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/usr/bin/env bash
  
@@ -266,7 +266,7 @@ Feature: Run command
 
     while [ true ]; do sleep 0.2; done
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/usr/bin/env bash
 
@@ -317,7 +317,7 @@ Feature: Run command
     If need to mix "long running" and "short running" commands, you should consider using the
     `exit_timeout`-option local to the `#run`-method.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/usr/bin/env bash
 
@@ -328,7 +328,7 @@ Feature: Run command
 
     do_some_work
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/usr/bin/env bash
 
@@ -358,7 +358,7 @@ Feature: Run command
     If need to mix "long running" and "short running" commands, you should consider using the
     `exit_timeout`-option local to the `#run`-method.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/usr/bin/env bash
 
@@ -369,7 +369,7 @@ Feature: Run command
 
     do_some_work
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/usr/bin/env bash
 
@@ -395,7 +395,7 @@ Feature: Run command
     Then the specs should all pass
 
   Scenario: Starting command twice fails
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 0
diff --git a/features/api/command/run_simple.feature b/features/api/command/run_simple.feature
index 2d49942f6..6e53b3271 100644
--- a/features/api/command/run_simple.feature
+++ b/features/api/command/run_simple.feature
@@ -13,7 +13,7 @@ Feature: Run command in a simpler fashion
     Given I use a fixture named "cli-app"
 
   Scenario: Require executable to succeed (by default value)
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 1
@@ -30,7 +30,7 @@ Feature: Run command in a simpler fashion
     Then the specs should all pass
 
   Scenario: Require executable to succeed (set by option)
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 1
@@ -47,7 +47,7 @@ Feature: Run command in a simpler fashion
     Then the specs should all pass
 
   Scenario: Require executable to succeed (set by option, deprecated)
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 1
@@ -64,7 +64,7 @@ Feature: Run command in a simpler fashion
     Then the specs should all pass
 
   Scenario: Ignore failure of executable (set by option)
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 1
@@ -81,7 +81,7 @@ Feature: Run command in a simpler fashion
     Then the specs should all pass
 
   Scenario: Ignore failure of executable (set by option, deprecated)
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 1
@@ -104,7 +104,7 @@ Feature: Run command in a simpler fashion
     Otherwise methods like `#send_signal` don't work since they require the
     command to be running and have setup it's signal handler.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -140,7 +140,7 @@ Feature: Run command in a simpler fashion
     If you have got a "long running" command, you should consider using the
     `exit_timeout`-option.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -171,7 +171,7 @@ Feature: Run command in a simpler fashion
     `#run_simple()` does not make sense. The command is stopped internally when
     its exit status is checked.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -208,7 +208,7 @@ Feature: Run command in a simpler fashion
 
   Scenario: Activate announcer channels on failure
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     echo "Hello, I'm STDOUT"
diff --git a/features/api/command/send_signal.feature b/features/api/command/send_signal.feature
index 9e9026acb..4675e1834 100644
--- a/features/api/command/send_signal.feature
+++ b/features/api/command/send_signal.feature
@@ -8,7 +8,7 @@ Feature: Send running command a signal
     Given I use a fixture named "cli-app"
 
   Scenario: Existing executable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """ruby
     #!/usr/bin/env bash
 
@@ -35,7 +35,7 @@ Feature: Send running command a signal
     Then the specs should all pass
 
   Scenario: Dying command
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """ruby
     #!/usr/bin/env bash
     exit 1
diff --git a/features/api/command/stderr.feature b/features/api/command/stderr.feature
index 3b95a1298..3fb1af708 100644
--- a/features/api/command/stderr.feature
+++ b/features/api/command/stderr.feature
@@ -8,7 +8,7 @@ Feature: Access STDERR of command
     And the default aruba io wait timeout is 1 seconds
 
   Scenario: Existing executable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     echo 'Hello, Aruba!' >&2
@@ -27,7 +27,7 @@ Feature: Access STDERR of command
     Then the specs should all pass
 
   Scenario: Waiting for output to "appear" after 2 seconds
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 1
diff --git a/features/api/command/stdout.feature b/features/api/command/stdout.feature
index 150a89357..19c9cb47d 100644
--- a/features/api/command/stdout.feature
+++ b/features/api/command/stdout.feature
@@ -8,7 +8,7 @@ Feature: Access STDOUT of command
     And the default aruba io wait timeout is 1 seconds
 
   Scenario: Existing executable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     echo 'Hello, Aruba!'
@@ -27,7 +27,7 @@ Feature: Access STDOUT of command
     Then the specs should all pass
 
   Scenario: Waiting for output to "appear" after 2 seconds
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 1
diff --git a/features/api/command/stop.feature b/features/api/command/stop.feature
index ec633c76a..079e50121 100644
--- a/features/api/command/stop.feature
+++ b/features/api/command/stop.feature
@@ -13,7 +13,7 @@ Feature: Stop command
     Given I use a fixture named "cli-app"
 
   Scenario: Stop command started last
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     function term {
@@ -37,7 +37,7 @@ Feature: Stop command
     Then the specs should all pass
 
   Scenario: Find and stop command
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     function term {
@@ -61,7 +61,7 @@ Feature: Stop command
     Then the specs should all pass
 
   Scenario: Stop successful command with configured signal
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     function hup {
@@ -96,7 +96,7 @@ Feature: Stop command
     Then the specs should all pass
 
   Scenario: Stop unsuccessful command with configured signal
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     function hup {
diff --git a/features/api/command/stop_all_commands.feature b/features/api/command/stop_all_commands.feature
index 27035bc44..6397be172 100644
--- a/features/api/command/stop_all_commands.feature
+++ b/features/api/command/stop_all_commands.feature
@@ -6,7 +6,7 @@ Feature: Stop all commands
     Given I use a fixture named "cli-app"
 
   Scenario: Multiple commands are running
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 3
@@ -28,7 +28,7 @@ Feature: Stop all commands
     Then the specs should all pass
 
   Scenario: Stop all commands for which the block returns true
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 1
diff --git a/features/api/command/terminate_all_commands.feature b/features/api/command/terminate_all_commands.feature
index 31bf0a935..9cc1dbb0d 100644
--- a/features/api/command/terminate_all_commands.feature
+++ b/features/api/command/terminate_all_commands.feature
@@ -6,7 +6,7 @@ Feature: Terminate all commands
     Given I use a fixture named "cli-app"
 
   Scenario: Multiple commands are running
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 3
@@ -28,7 +28,7 @@ Feature: Terminate all commands
     Then the specs should all pass
 
   Scenario: Terminate all commands for which the block returns true
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 1
diff --git a/features/api/command/which.feature b/features/api/command/which.feature
index 9a36802cc..a4f01192f 100644
--- a/features/api/command/which.feature
+++ b/features/api/command/which.feature
@@ -7,7 +7,7 @@ Feature: Get path to command
     Given I use a fixture named "cli-app"
 
   Scenario: Existing executable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     exit 0
@@ -17,14 +17,14 @@ Feature: Get path to command
     require 'spec_helper'
 
     RSpec.describe 'Find path for command', :type => :aruba do
-      it { expect(which('cli')).to match %r{tmp/aruba/cli-app/bin/cli} }
+      it { expect(which('cli')).to match %r{tmp/aruba/cli-app/bin/aruba-test-cli} }
     end
     """
     When I run `rspec`
     Then the specs should all pass
 
   Scenario: Non-existing executable
-    Given a file named "bin/cli" does not exist
+    Given a file named "bin/aruba-test-cli" does not exist
     And a file named "spec/which_spec.rb" with:
     """ruby
     require 'spec_helper'
diff --git a/features/api/text/extract_text.feature b/features/api/text/extract_text.feature
index 9f34cf381..caa82b6d7 100644
--- a/features/api/text/extract_text.feature
+++ b/features/api/text/extract_text.feature
@@ -7,7 +7,7 @@ Feature: Extract text from output
     Given I use a fixture named "cli-app"
 
   Scenario: Output contains ansi escape codes prefixed by \e
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n "\e[31mText"
@@ -27,7 +27,7 @@ Feature: Extract text from output
     Then the specs should all pass
 
   Scenario: Output contains ansi escape codes prefixed by \033
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n "\033[31mText"
@@ -47,7 +47,7 @@ Feature: Extract text from output
     Then the specs should all pass
 
     # Scenario: Output contains ansi escape code \016
-    #   Given an executable named "bin/cli" with:
+    #   Given an executable named "bin/aruba-test-cli" with:
     #   """
     #   #!/bin/bash
     #   echo -n "\016Text"
@@ -67,7 +67,7 @@ Feature: Extract text from output
     #   Then the specs should all pass
 
     # Scenario: Output contains ansi escape code \017
-    #   Given an executable named "bin/cli" with:
+    #   Given an executable named "bin/aruba-test-cli" with:
     #   """
     #   #!/bin/bash
     #   echo -n "\017Text"
diff --git a/features/api/text/replace_variables.feature b/features/api/text/replace_variables.feature
index dae4d8622..b7d1907ec 100644
--- a/features/api/text/replace_variables.feature
+++ b/features/api/text/replace_variables.feature
@@ -12,7 +12,7 @@ Feature: Replace variables
     Given I use a fixture named "cli-app"
 
   Scenario: PID of last command started
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 0
diff --git a/features/api/text/sanitize_text.feature b/features/api/text/sanitize_text.feature
index e83b0f46a..33f7a0bba 100644
--- a/features/api/text/sanitize_text.feature
+++ b/features/api/text/sanitize_text.feature
@@ -8,7 +8,7 @@ Feature: Sanitize text from output
     Given I use a fixture named "cli-app"
 
   Scenario: Output contains \n
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\ntext'
@@ -28,7 +28,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains \e
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\etext'
@@ -48,7 +48,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains \"
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\"text'
@@ -68,7 +68,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains \033
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\033text'
@@ -88,7 +88,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains \017
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\017text'
@@ -108,7 +108,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains \016
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\016text'
@@ -128,7 +128,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains ansi escape codes prefixed by \e
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n "\e[31mText"
@@ -148,7 +148,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains ansi escape codes prefixed by \033
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n "\033[31mText"
@@ -168,7 +168,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
   Scenario: Output contains ansi escape codes prefixed by \e, but removable is disabled by configuration
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n "\e[31mText"
@@ -188,7 +188,7 @@ Feature: Sanitize text from output
     Then the specs should all pass
 
     # Scenario: Output contains ansi escape code \016
-    #   Given an executable named "bin/cli" with:
+    #   Given an executable named "bin/aruba-test-cli" with:
     #   """
     #   #!/bin/bash
     #   echo -n "\016Text"
@@ -208,7 +208,7 @@ Feature: Sanitize text from output
     #   Then the specs should all pass
 
     # Scenario: Output contains ansi escape code \017
-    #   Given an executable named "bin/cli" with:
+    #   Given an executable named "bin/aruba-test-cli" with:
     #   """
     #   #!/bin/bash
     #   echo -n "\017Text"
diff --git a/features/api/text/unescape_text.feature b/features/api/text/unescape_text.feature
index e5bde0547..e6682fd71 100644
--- a/features/api/text/unescape_text.feature
+++ b/features/api/text/unescape_text.feature
@@ -7,7 +7,7 @@ Feature: Unescape special characters in text
     Given I use a fixture named "cli-app"
 
   Scenario: Output contains \n
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\ntext'
@@ -27,7 +27,7 @@ Feature: Unescape special characters in text
     Then the specs should all pass
 
   Scenario: Output contains \e
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\etext'
@@ -47,7 +47,7 @@ Feature: Unescape special characters in text
     Then the specs should all pass
 
   Scenario: Output contains \"
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\"text'
@@ -67,7 +67,7 @@ Feature: Unescape special characters in text
     Then the specs should all pass
 
   Scenario: Output contains \033
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\033text'
@@ -87,7 +87,7 @@ Feature: Unescape special characters in text
     Then the specs should all pass
 
   Scenario: Output contains \017
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\017text'
@@ -107,7 +107,7 @@ Feature: Unescape special characters in text
     Then the specs should all pass
 
   Scenario: Output contains \016
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo -n 'text\016text'
diff --git a/features/configuration/exit_timeout.feature b/features/configuration/exit_timeout.feature
index b1406ab3a..749e44379 100644
--- a/features/configuration/exit_timeout.feature
+++ b/features/configuration/exit_timeout.feature
@@ -21,7 +21,7 @@ Feature: Configure timeout for command execution
     """
 
   Scenario: Modify value
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     sleep 1
@@ -36,7 +36,7 @@ Feature: Configure timeout for command execution
     Then I successfully run `cucumber`
 
   Scenario: Fails if takes longer
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """ruby
     #!/bin/bash
     sleep 2
diff --git a/features/configuration/usage.feature b/features/configuration/usage.feature
index 1d4676f25..ec1502f7b 100644
--- a/features/configuration/usage.feature
+++ b/features/configuration/usage.feature
@@ -13,7 +13,7 @@ Feature: Usage of configuration
 
   Background:
     Given I use a fixture named "cli-app"
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     trap "exit 128" SIGTERM SIGINT
diff --git a/features/getting_started/run_commands.feature b/features/getting_started/run_commands.feature
index 15011e53e..507619056 100644
--- a/features/getting_started/run_commands.feature
+++ b/features/getting_started/run_commands.feature
@@ -25,7 +25,7 @@ Feature: Run commands with Aruba
 
   @requires-bash
   Scenario: Bash Program
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -55,7 +55,7 @@ Feature: Run commands with Aruba
 
   @requires-ruby
   Scenario: Ruby Program
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """ruby
     #!/usr/bin/env ruby
 
@@ -85,7 +85,7 @@ Feature: Run commands with Aruba
 
   @requires-python
   Scenario: Python Program
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """python
     #!/usr/bin/env python
 
@@ -115,7 +115,7 @@ Feature: Run commands with Aruba
 
   @requires-perl
   Scenario: Perl Program
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """perl
     #!/usr/bin/env perl
 
diff --git a/features/matchers/timeouts.feature b/features/matchers/timeouts.feature
index 012c2c829..a073ae435 100644
--- a/features/matchers/timeouts.feature
+++ b/features/matchers/timeouts.feature
@@ -6,7 +6,7 @@ Feature: Check if a timeout occured during command execution
     Given I use a fixture named "cli-app"
 
   Scenario: Check if command runs to long
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     sleep 1
@@ -27,7 +27,7 @@ Feature: Check if a timeout occured during command execution
     Then the specs should all pass
 
   Scenario: Check if command finishes in time
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 0
diff --git a/features/step_definitions/aruba_dev_steps.rb b/features/step_definitions/aruba_dev_steps.rb
index e96e4b579..20ff7850e 100644
--- a/features/step_definitions/aruba_dev_steps.rb
+++ b/features/step_definitions/aruba_dev_steps.rb
@@ -26,7 +26,7 @@
 end
 
 Given(/^the default executable$/) do
-  step 'an executable named "bin/cli" with:', <<-EOS
+  step 'an executable named "bin/aruba-test-cli" with:', <<-EOS
 #!/usr/bin/env ruby
 
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
diff --git a/features/steps/command/debug.feature b/features/steps/command/debug.feature
index 0211a7af9..c560c7a5e 100644
--- a/features/steps/command/debug.feature
+++ b/features/steps/command/debug.feature
@@ -9,7 +9,7 @@ Feature: Debug your command in cucumber-test-run
     And the default aruba exit timeout is 60 seconds
 
   Scenario: Can handle exit status 0
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -28,7 +28,7 @@ Feature: Debug your command in cucumber-test-run
     Then the features should all pass
 
   Scenario: Can handle exit status 1
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -60,7 +60,7 @@ Feature: Debug your command in cucumber-test-run
     We are going to demonstrate this using `pry`, but any other interactive
     debugger for any other programming language should also work.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """ruby
     #!/usr/bin/env ruby
 
diff --git a/features/steps/command/exit_statuses.feature b/features/steps/command/exit_statuses.feature
index 9a4014c29..b5750f06d 100644
--- a/features/steps/command/exit_statuses.feature
+++ b/features/steps/command/exit_statuses.feature
@@ -7,7 +7,7 @@ Feature: Check exit status of commands
     Given I use a fixture named "cli-app"
 
   Scenario: Test for exit status of 0
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 0
@@ -23,7 +23,7 @@ Feature: Check exit status of commands
     Then the features should all pass
 
   Scenario: Test for exit status 1
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 1
@@ -39,7 +39,7 @@ Feature: Check exit status of commands
     Then the features should all pass
 
   Scenario: Test for non-zero exit status
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 1
@@ -55,7 +55,7 @@ Feature: Check exit status of commands
     Then the features should all pass
 
   Scenario: Successfully run something
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 0
@@ -70,7 +70,7 @@ Feature: Check exit status of commands
     Then the features should all pass
 
   Scenario: Fail to run something successfully
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 1
@@ -85,7 +85,7 @@ Feature: Check exit status of commands
     Then the features should not all pass
 
   Scenario: Overwrite the default exit timeout via step
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     sleep 1
@@ -101,7 +101,7 @@ Feature: Check exit status of commands
     Then the features should all pass
 
   Scenario: Successfully run something longer then the default time
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     sleep 1
@@ -117,7 +117,7 @@ Feature: Check exit status of commands
     Then the features should all pass
 
   Scenario: Unsuccessfully run something that takes too long
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     sleep 2
diff --git a/features/steps/command/in_process.feature b/features/steps/command/in_process.feature
index b4c1022c8..2b71228d3 100644
--- a/features/steps/command/in_process.feature
+++ b/features/steps/command/in_process.feature
@@ -103,7 +103,7 @@ Feature: Run commands in ruby process
     Then the features should all pass
 
   Scenario: Mixing custom code and normal cli
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo $*
diff --git a/features/steps/command/interactive.feature b/features/steps/command/interactive.feature
index 1932c0bc1..a033a5a3c 100644
--- a/features/steps/command/interactive.feature
+++ b/features/steps/command/interactive.feature
@@ -9,7 +9,7 @@ Feature: Running an interactive command
 
   @wip-jruby-java-1.6
   Scenario: Running ruby interactively
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env ruby
 
diff --git a/features/steps/command/output.feature b/features/steps/command/output.feature
index 17f3f7257..ce52b76f9 100644
--- a/features/steps/command/output.feature
+++ b/features/steps/command/output.feature
@@ -8,7 +8,7 @@ Feature: All output of commands which were executed
     Given I use a fixture named "cli-app"
 
   Scenario: Detect subset of one-line output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -25,7 +25,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect absence of one-line output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -42,7 +42,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect subset of multiline output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -62,7 +62,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect absence of subset of multiline output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -97,7 +97,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect exact one-line output for ruby commands
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """ruby
     #!/usr/bin/env ruby
 
@@ -117,7 +117,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect exact one-line output with ANSI output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -139,7 +139,7 @@ Feature: All output of commands which were executed
 
   Scenario: Detect exact one-line output with ANSI output stripped by default
     Given the default aruba exit timeout is 12 seconds
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -159,7 +159,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect exact multiline output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -180,7 +180,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect subset of one-line output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -197,7 +197,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect subset of one-line output with regex
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -214,7 +214,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect subset of multiline output with regex
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -237,7 +237,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Negative matching of one-line output with regex
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -254,7 +254,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Negative matching of multiline output with regex
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -278,7 +278,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Match passing exit status and partial output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -299,7 +299,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Match passing exit status and exact output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -321,7 +321,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Match failing exit status and partial output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -343,7 +343,7 @@ Feature: All output of commands which were executed
 
 
   Scenario: Match failing exit status and exact output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -365,7 +365,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Match failing exit status and output with regex
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -387,13 +387,13 @@ Feature: All output of commands which were executed
 
   @requires-aruba-version-1
   Scenario: Detect output from all processes
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/usr/bin/env bash
 
     echo 'This is cli1'
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/usr/bin/env bash
 
@@ -418,13 +418,13 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Detect output from all processes (deprecated)
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/usr/bin/env bash
 
     echo 'This is cli1'
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/usr/bin/env bash
 
@@ -446,7 +446,7 @@ Feature: All output of commands which were executed
     Then the features should all pass
 
   Scenario: Handle little output
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -473,7 +473,7 @@ Feature: All output of commands which were executed
     I want to make sure that large amounts of output aren't buffered
 
     Given the default aruba exit timeout is 10 seconds
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -495,7 +495,7 @@ Feature: All output of commands which were executed
 
   Scenario: Handle tons of interactive output
     Given the default aruba exit timeout is 10 seconds
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -518,12 +518,12 @@ Feature: All output of commands which were executed
 
   @requires-aruba-version-1
   Scenario: Detect output from all processes normal and interactive ones
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """
     #!/usr/bin/env bash
     echo 'This is cli1'
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """
     #!/usr/bin/env ruby
 
diff --git a/features/steps/command/run.feature b/features/steps/command/run.feature
index debd0dbe6..5afbfe102 100644
--- a/features/steps/command/run.feature
+++ b/features/steps/command/run.feature
@@ -6,7 +6,7 @@ Feature: Run commands
     Given I use a fixture named "cli-app"
 
   Scenario: Run command found in path
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 0
@@ -21,7 +21,7 @@ Feature: Run commands
     Then the features should all pass
 
   Scenario: Activate desired announcers when running command fails
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     echo "Hello, I'm STDOUT"
diff --git a/features/steps/command/send_signal.feature b/features/steps/command/send_signal.feature
index ffa012a3a..2a721bc6d 100644
--- a/features/steps/command/send_signal.feature
+++ b/features/steps/command/send_signal.feature
@@ -3,7 +3,7 @@ Feature: Send a signal to command
   You can send a command a signal with the following steps:
 
   - `When I send the signal "HUP" to the command started last`
-  - `When I send the signal "HUP" to the command "bin/cli"`
+  - `When I send the signal "HUP" to the command "bin/aruba-test-cli"`
 
   Or just use `kill` on compatible platforms.
 
@@ -11,7 +11,7 @@ Feature: Send a signal to command
     Given I use a fixture named "cli-app"
 
   Scenario: Sending signal to the command started last
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
     function hup {
@@ -40,7 +40,7 @@ Feature: Send a signal to command
     Then the features should all pass
 
   Scenario: Sending signal to a command given by command line
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
     function hup {
@@ -76,7 +76,7 @@ Feature: Send a signal to command
     PID of the last command started. Please note, this feature is experimental.
     The name of the variable may change without further notice.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
     function hup {
diff --git a/features/steps/command/stdout.feature b/features/steps/command/stdout.feature
index 318932a99..1bc56c7d4 100644
--- a/features/steps/command/stdout.feature
+++ b/features/steps/command/stdout.feature
@@ -8,7 +8,7 @@ Feature: STDOUT of commands which were executed
     Given I use a fixture named "cli-app"
 
   Scenario: Match output in stdout
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -26,7 +26,7 @@ Feature: STDOUT of commands which were executed
     Then the features should all pass
 
   Scenario: Match stdout on several lines
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -46,7 +46,7 @@ Feature: STDOUT of commands which were executed
     Then the features should all pass
 
   Scenario: Match output on several lines where stdout contains quotes
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
diff --git a/features/steps/command/stop.feature b/features/steps/command/stop.feature
index 41b39bbc0..52cc42176 100644
--- a/features/steps/command/stop.feature
+++ b/features/steps/command/stop.feature
@@ -15,7 +15,7 @@ Feature: Stop commands
 
     Terminating a command will send `SIGTERM` to the command.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/bin/bash
 
@@ -28,7 +28,7 @@ Feature: Stop commands
     while [ true ]; do sleep 1; done
     exit 1
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/bin/bash
 
@@ -65,7 +65,7 @@ Feature: Stop commands
     send `SIGTERM` to the command. Normally "n" is defined by the default exit
     timeout of aruba.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/bin/bash
 
@@ -78,7 +78,7 @@ Feature: Stop commands
     while [ true ]; do sleep 1; done
     exit 1
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/bin/bash
 
@@ -116,7 +116,7 @@ Feature: Stop commands
     Pass the commandline to the step to find the command, which should be
     stopped.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/bin/bash
 
@@ -128,7 +128,7 @@ Feature: Stop commands
     echo "Hello, Aruba!"
     while [ true ]; do sleep 1; done
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/bin/bash
 
@@ -167,7 +167,7 @@ Feature: Stop commands
     send `SIGTERM` to the command. Normally "n" is defined by the default exit
     timeout of aruba.
 
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/bin/bash
 
@@ -180,7 +180,7 @@ Feature: Stop commands
     while [ true ]; do sleep 1; done
     exit 1
     """
-    And an executable named "bin/cli2" with:
+    And an executable named "bin/aruba-test-cli2" with:
     """bash
     #!/bin/bash
 
@@ -217,7 +217,7 @@ Feature: Stop commands
 
     You can define a default signal which is used to stop all commands.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/bin/bash
     function hup {
@@ -248,7 +248,7 @@ Feature: Stop commands
 
   @requires-ruby-platform-java
   Scenario: STDERR/STDOUT is empty on JRUBY if output was written in "signal"-handler
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/bin/bash
 
@@ -281,7 +281,7 @@ Feature: Stop commands
 
   @requires-ruby-platform-mri
   Scenario: STDERR/STDOUT is written normally with MRI-Ruby if output was written in "signal"-handler
-    Given an executable named "bin/cli1" with:
+    Given an executable named "bin/aruba-test-cli1" with:
     """bash
     #!/bin/bash
 
diff --git a/features/steps/core/announce.feature b/features/steps/core/announce.feature
index 5a4d370cf..7e4afbdfd 100644
--- a/features/steps/core/announce.feature
+++ b/features/steps/core/announce.feature
@@ -48,7 +48,7 @@ Feature: Announce output during test run
     """
 
   Scenario: Announce stdout
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -73,7 +73,7 @@ Feature: Announce output during test run
     """
 
   Scenario: Announce stderr
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -98,7 +98,7 @@ Feature: Announce output during test run
     """
 
   Scenario: Announce both stderr and stdout
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -131,7 +131,7 @@ Feature: Announce output during test run
     """
 
   Scenario: Announce command
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -153,7 +153,7 @@ Feature: Announce output during test run
     """
 
   Scenario: Announce change of environment variable
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -178,7 +178,7 @@ Feature: Announce output during test run
     """
 
   Scenario: Announce change of environment variable which contains special characters
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -206,7 +206,7 @@ Feature: Announce output during test run
     This will output information like owner, group, atime, mtime, ctime, size,
     mode and if command is executable.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
@@ -259,7 +259,7 @@ Feature: Announce output during test run
     This will output the content of the executable command. Be careful doing
     this with binary executables. This hook should be used with scripts only.
 
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """bash
     #!/usr/bin/env bash
 
diff --git a/features/steps/environment/append_environment_variable.feature b/features/steps/environment/append_environment_variable.feature
index d9f59fe59..f86f90baa 100644
--- a/features/steps/environment/append_environment_variable.feature
+++ b/features/steps/environment/append_environment_variable.feature
@@ -8,7 +8,7 @@ Feature: Append environment variable via "cucumber"-step
 
   Background:
     Given I use the fixture "cli-app"
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
 
diff --git a/features/steps/environment/home_variable.feature b/features/steps/environment/home_variable.feature
index 42d4f7c9a..8200fe1ed 100644
--- a/features/steps/environment/home_variable.feature
+++ b/features/steps/environment/home_variable.feature
@@ -11,7 +11,7 @@ Feature: Mock the HOME variable
 
   Background:
     Given I use the fixture "cli-app"
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
 
diff --git a/features/steps/environment/prepend_environment_variable.feature b/features/steps/environment/prepend_environment_variable.feature
index d7b73c813..b272f81c3 100644
--- a/features/steps/environment/prepend_environment_variable.feature
+++ b/features/steps/environment/prepend_environment_variable.feature
@@ -8,7 +8,7 @@ Feature: Prepend environment variable via "cucumber"-step
 
   Background:
     Given I use the fixture "cli-app"
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
 
diff --git a/features/steps/environment/set_environment_variable.feature b/features/steps/environment/set_environment_variable.feature
index c04c1c54d..d9d72f2f2 100644
--- a/features/steps/environment/set_environment_variable.feature
+++ b/features/steps/environment/set_environment_variable.feature
@@ -9,7 +9,7 @@ Feature: Set environment variable via "cucumber"-step
 
   Background:
     Given I use the fixture "cli-app"
-    And an executable named "bin/cli" with:
+    And an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
 
diff --git a/features/steps/overview.feature b/features/steps/overview.feature
index 76722d216..35451c406 100644
--- a/features/steps/overview.feature
+++ b/features/steps/overview.feature
@@ -8,7 +8,7 @@ Feature: Overview of steps
     Given I use a fixture named "cli-app"
 
   Scenario: Use information found in repository
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     git clone https://github.com/cucumber/aruba.git
diff --git a/fixtures/cli-app/bin/cli b/fixtures/cli-app/bin/aruba-test-cli
similarity index 100%
rename from fixtures/cli-app/bin/cli
rename to fixtures/cli-app/bin/aruba-test-cli