diff --git a/features/options/datastore/datastore.feature b/features/options/datastore/datastore.feature
index 26c875d9356..f9a762cf3cd 100644
--- a/features/options/datastore/datastore.feature
+++ b/features/options/datastore/datastore.feature
@@ -31,3 +31,13 @@ Feature: osrm-datastore command line options
         Then it should exit successfully
         When I try to run "osrm-datastore {processed_file} --dataset-name cucumber/only_metric_test --only-metric"
         Then it should exit successfully
+
+    Scenario: osrm-datastore - Displaying help should work
+        When I try to run "osrm-datastore {processed_file} --help"
+        Then it should exit successfully
+
+    Scenario: osrm-datastore - Errors on invalid path
+        When I try to run "osrm-datastore invalid_path.osrm"
+        Then stderr should contain "[error] Config contains invalid file paths."
+        And stderr should contain "Missing/Broken"
+        And it should exit with an error