diff --git a/features/testbot/distance.feature b/features/testbot/distance.feature
index ac1f38364..1fb436bc6 100644
--- a/features/testbot/distance.feature
+++ b/features/testbot/distance.feature
@@ -29,7 +29,7 @@ Feature: Distance calculation
 
 		When I route I should get
 		 | from | to | route | distance |
-		 | a    | d  | abcde | 300m +-8 |
+		 | a    | d  | abcde | 300m +-2 |
 
 	Scenario: Distance should equal sum of segments, rightwinded
 		Given the node map
@@ -43,7 +43,7 @@ Feature: Distance calculation
 
 		When I route I should get
 		 | from | to | route | distance |
-		 | a    | d  | abcde | 300m +-8 |
+		 | a    | d  | abcde | 300m +-2 |
 
 	Scenario: 10m distances
 		Given a grid size of 10 meters
diff --git a/features/testbot/weight.feature b/features/testbot/fastest.feature
similarity index 84%
rename from features/testbot/weight.feature
rename to features/testbot/fastest.feature
index 0e3551ff2..572280cd7 100644
--- a/features/testbot/weight.feature
+++ b/features/testbot/fastest.feature
@@ -1,5 +1,5 @@
-@routing @weight
-Feature: Choosing route based on length, speed, etc
+@routing @fastest
+Feature: Choosing fastest route
 	
 	Background:
 		Given the profile "testbot"
@@ -22,7 +22,7 @@ Feature: Choosing route based on length, speed, etc
 		 | x    | y  | xa,atb,by |
 		 | y    | x  | by,atb,xa |
 
-	Scenario: Pick  the shortest travel time, even when it's longer
+	Scenario: Pick the fastest route, even when it's longer
 		Given the node map
 		 |   | p |   |
 		 | a | s | b |