diff --git a/features/support/route.js b/features/support/route.js
index 065f44bc3..d75ae3882 100644
--- a/features/support/route.js
+++ b/features/support/route.js
@@ -75,10 +75,17 @@ module.exports = function () {
         }
 
         if (this.osrmLoader.method === 'valhalla') {
+
+        var val_costing = 'auto';
+        if (this.profile === 'bicycle')
+           val_costing = 'bicycle';
+        else if (this.profile === 'foot')
+           val_costing = 'pedestrian';
+
         params = {
             json: JSON.stringify({ 
                 locations: waypoints.map(w => {return{ lat: w.lat, lon: w.lon };}),
-                costing: 'auto',
+                costing: val_costing,
                 directions_options:{
                     units:'miles'}
                 }),