diff --git a/features/car/maxspeed.feature b/features/car/maxspeed.feature
index df37e3fb5..f3771cc2b 100644
--- a/features/car/maxspeed.feature
+++ b/features/car/maxspeed.feature
@@ -18,7 +18,7 @@ When a max speed is set, osrm will use 2/3 of that as the actual speed.
         When I route I should get
             | from | to | route | speed   |
             | a    | b  | ab    | 85 km/h |
-            | b    | c  | bc    | 40 km/h |
+            | b    | c  | bc    | 39 km/h |
 
     Scenario: Car - Do not ignore maxspeed when higher than way speed
         Given the node map
@@ -32,7 +32,7 @@ When a max speed is set, osrm will use 2/3 of that as the actual speed.
         When I route I should get
             | from | to | route | speed   |
             | a    | b  | ab    | 25 km/h |
-            | b    | c  | bc    | 60 km/h |
+            | b    | c  | bc    | 59 km/h |
 
     Scenario: Car - Forward/backward maxspeed
         Given a grid size of 100 meters
@@ -43,8 +43,8 @@ When a max speed is set, osrm will use 2/3 of that as the actual speed.
             | primary | 60       |                  |                   | 40 km/h | 40 km/h |
             | primary |          | 60               |                   | 40 km/h | 65 km/h |
             | primary |          |                  | 60                | 65 km/h | 40 km/h |
-            | primary | 15       | 60               |                   | 40 km/h | 10 km/h |
-            | primary | 15       |                  | 60                | 10 km/h | 40 km/h |
+            | primary | 15       | 60               |                   | 40 km/h |  9 km/h |
+            | primary | 15       |                  | 60                |  9 km/h | 40 km/h |
             | primary | 15       | 30               | 60                | 20 km/h | 40 km/h |
 
     Scenario: Car - Maxspeed should not allow routing on unroutable ways
@@ -62,4 +62,4 @@ When a max speed is set, osrm will use 2/3 of that as the actual speed.
             | runway    |         |        |          |                  |                   |       |
             | runway    |         |        | 100      |                  |                   |       |
             | runway    |         |        |          | 100              |                   |       |
-            | runway    |         |        |          |                  | 100               |       |
\ No newline at end of file
+            | runway    |         |        |          |                  | 100               |       |
diff --git a/features/car/speed.feature b/features/car/speed.feature
index 261f9aa62..a7a614a19 100644
--- a/features/car/speed.feature
+++ b/features/car/speed.feature
@@ -1,20 +1,20 @@
-@routing @car @speed    
+@routing @car @speed
 Feature: Car - speeds
 
     Background:
         Given the profile "car"
         And a grid size of 1000 meters
-    
+
     Scenario: Car - speed of various way types
         Then routability should be
             | highway        | oneway | bothw   |
             | motorway       | no     | 90 km/h |
             | motorway_link  | no     | 75 km/h |
-            | trunk          | no     | 85 km/h |
-            | trunk_link     | no     | 70 km/h |
-            | primary        | no     | 65 km/h |
+            | trunk          | no     | 84 km/h |
+            | trunk_link     | no     | 69 km/h |
+            | primary        | no     | 64 km/h |
             | primary_link   | no     | 60 km/h |
-            | secondary      | no     | 55 km/h |
+            | secondary      | no     | 54 km/h |
             | secondary_link | no     | 50 km/h |
             | tertiary       | no     | 40 km/h |
             | tertiary_link  | no     | 30 km/h |
diff --git a/features/step_definitions/routability.rb b/features/step_definitions/routability.rb
index d8a8a3945..cea5481ba 100644
--- a/features/step_definitions/routability.rb
+++ b/features/step_definitions/routability.rb
@@ -11,7 +11,7 @@ def test_routability_row i
     r[:status] = route_status r[:response]
     if r[:status].empty? == false
       r[:route] = way_list r[:json]['route_instructions']
-      
+
       if r[:route]=="w#{i}"
         r[:time] = r[:json]['route_summary']['total_time']
         r[:distance] = r[:json]['route_summary']['total_distance']
@@ -24,7 +24,7 @@ def test_routability_row i
     end
     result[direction] = r
   end
-  
+
   # check if forw and backw returned the same values
   result['bothw'] = {}
   [:status,:time,:distance,:speed].each do |key|
@@ -62,12 +62,12 @@ Then /^routability should be$/ do |table|
         else
           raise "*** Unknown expectation format: #{want}"
         end
-        
+
         if FuzzyMatch.match output_row[direction], want
           output_row[direction] = row[direction]
         end
       end
-      
+
       if output_row != row
         log_fail row,output_row,result
       end
diff --git a/features/testbot/opposite.feature b/features/testbot/opposite.feature
index cd350e73b..9fdce5675 100644
--- a/features/testbot/opposite.feature
+++ b/features/testbot/opposite.feature
@@ -15,4 +15,4 @@ Feature: Separate settings for forward/backward direction
         When I route I should get
             | from | to | route | distance  | speed   |
             | a    | d  | abcd  | 300 +- 1m | 36 km/h |
-            | d    | a  | abcd  | 300 +- 1m | 16 km/h |
+            | d    | a  | abcd  | 300 +- 1m | 15 km/h |
diff --git a/features/testbot/speed.feature b/features/testbot/speed.feature
index c9a983136..81674e944 100644
--- a/features/testbot/speed.feature
+++ b/features/testbot/speed.feature
@@ -28,4 +28,4 @@ Feature: Testbot - speeds
         When I route I should get
             | from | to | route | speed   | time | distance |
             | a    | b  | ab    | 36 km/h | 10s  | 100m     |
-            | b    | a  | ab    | 16 km/h | 22s  | 100m     |
+            | b    | a  | ab    | 15 km/h | 23s  | 100m     |