diff --git a/features/step_definitions/requests.rb b/features/step_definitions/requests.rb
index c546d13d4..6de50c324 100644
--- a/features/step_definitions/requests.rb
+++ b/features/step_definitions/requests.rb
@@ -38,8 +38,8 @@ When /^I preprocess data$/ do
   end
 end
 
-Then /^preparing should return code (\d+)$/ do |code|
+Then /^"([^"]*)" should return code (\d+)$/ do |binary, code|
   @process_error.class.should == OSRMError
-  @process_error.process.should == 'osrm-prepare'
+  @process_error.process.should == binary
   @process_error.code.to_i.should == code.to_i
 end
diff --git a/features/testbot/bad.feature b/features/testbot/bad.feature
index aa3275a1f..77a660776 100644
--- a/features/testbot/bad.feature
+++ b/features/testbot/bad.feature
@@ -12,7 +12,7 @@ Feature: Handle bad data in a graceful manner
 		 | nodes |
 		
 		When I preprocess data
-		Then preparing should return code 255
+		Then "osrm-extract" should return code 255
 
 	Scenario: Only dead-end oneways
 		Given the node map