diff --git a/features/options/help.feature b/features/options/help.feature
index 31e8862cd..3be47e9b7 100644
--- a/features/options/help.feature
+++ b/features/options/help.feature
@@ -6,8 +6,7 @@ Feature: Command line options: help
 
     Scenario: No options should show help
         When I run "osrm-routed"
-        Then it should exit with code 0
-        And stderr should be empty
+        Then stderr should be empty
         And stdout should contain "osrm-routed <base.osrm> [<options>]:"
         And stdout should contain "Options:"
         And stdout should contain "--version"
@@ -26,11 +25,11 @@ Feature: Command line options: help
         And stdout should contain "--port"
         And stdout should contain "--threads"
         And stdout should contain "--sharedmemory"
+        And it should exit with code 0
 
     Scenario: Help, short
         When I run "osrm-routed -h"
-        Then it should exit with code 0
-        And stderr should be empty
+        Then stderr should be empty
         And stdout should contain "osrm-routed <base.osrm> [<options>]:"
         And stdout should contain "Options:"
         And stdout should contain "--version"
@@ -49,11 +48,11 @@ Feature: Command line options: help
         And stdout should contain "--port"
         And stdout should contain "--threads"
         And stdout should contain "--sharedmemory"
+        And it should exit with code 0
 
     Scenario: Help, long
         When I run "osrm-routed --help"
-        Then it should exit with code 0
-        And stderr should be empty
+        Then stderr should be empty
         And stdout should contain "osrm-routed <base.osrm> [<options>]:"
         And stdout should contain "Options:"
         And stdout should contain "--version"
@@ -71,4 +70,5 @@ Feature: Command line options: help
         And stdout should contain "--ip"
         And stdout should contain "--port"
         And stdout should contain "--threads"
-        And stdout should contain "--sharedmemory"
\ No newline at end of file
+        And stdout should contain "--sharedmemory"
+        And it should exit with code 0
diff --git a/features/options/invalid.feature b/features/options/invalid.feature
index 86801f976..02bda69c0 100644
--- a/features/options/invalid.feature
+++ b/features/options/invalid.feature
@@ -6,13 +6,15 @@ Feature: Command line options: invalid options
 
     Scenario: Non-existing option
         When I run "osrm-routed --fly-me-to-the-moon"
-        Then it should exit with code 255
         Then stdout should be empty
         And stderr should contain "exception"
         And stderr should contain "fly-me-to-the-moon"
+        And it should exit with code 255
 
     Scenario: Missing file
         When I run "osrm-routed over-the-rainbow.osrm"
-        Then it should exit with code 255
+        Then stdout should contain "over-the-rainbow.osrm"
         And stderr should contain "exception"
-        And stderr should contain "does not exist"
\ No newline at end of file
+        And stderr should contain "does not exist"
+        And it should exit with code 255
+        
\ No newline at end of file
diff --git a/features/options/version.feature b/features/options/version.feature
index a9c222428..085eb331e 100644
--- a/features/options/version.feature
+++ b/features/options/version.feature
@@ -6,12 +6,12 @@ Feature: Command line options: version
 
     Scenario: Version, short
         When I run "osrm-routed -v"
-        Then it should exit with code 0
-        And stderr should be empty
+        Then stderr should be empty
         And stdout should contain " v0."
+        And it should exit with code 0
 
     Scenario: Version, long
         When I run "osrm-routed --version"
-        Then it should exit with code 0
-        And stderr should be empty
-        And stdout should contain " v0."
\ No newline at end of file
+        Then stderr should be empty
+        And stdout should contain " v0."
+        And it should exit with code 0
\ No newline at end of file