diff --git a/features/testbot/opposite.feature b/features/testbot/opposite.feature
index 176974965..9b5df779d 100644
--- a/features/testbot/opposite.feature
+++ b/features/testbot/opposite.feature
@@ -1,4 +1,4 @@
-@routing @opposite @todo
+@routing @opposite
 Feature: Separate settings for forward/backward direction
 	
 	Background:
@@ -7,13 +7,13 @@ Feature: Separate settings for forward/backward direction
 	@smallest
 	Scenario: Going against the flow
 		Given the node map
-		 | a | b |
+		 | a | b | c | d |
 	
 		And the ways
 		 | nodes | highway |
-		 | ab    | river   |
+		 | abcd  | river   |
     
 		When I route I should get
-		 | from | to | route | distance | time |
-		 | a    | b  | ab    | 100m     | 10s  |
-		 | b    | a  | ab    | 100m     | 20s  |
+		 | from | to | route | distance  | time |
+		 | a    | d  | abcd  | 300 +- 1m | 30s  |
+		 | d    | a  | abcd  | 300 +- 1m | 55s  |
diff --git a/profiles/testbot.lua b/profiles/testbot.lua
index 3eb1ff339..341cb6d23 100644
--- a/profiles/testbot.lua
+++ b/profiles/testbot.lua
@@ -56,6 +56,12 @@ function way_function (way, numberOfNodesInWay)
 		way.speed = speed_profile[highway] or speed_profile['default']
 	end
 	
+	if(highway == "river") then
+		local temp_speed = way.speed;
+		way.speed = temp_speed*3/2
+		way.backward_speed = temp_speed*2/3
+	end
+	
 	if oneway == "no" or oneway == "0" or oneway == "false" then
 		way.direction = Way.bidirectional
 	elseif oneway == "-1" then