diff --git a/features/bicycle/ferry.feature b/features/bicycle/ferry.feature
index 378a3a656..1223da6c6 100644
--- a/features/bicycle/ferry.feature
+++ b/features/bicycle/ferry.feature
@@ -113,7 +113,8 @@ Feature: Bike - Handle ferry routes
 		 | from | to | route   | time       |
 		 | a    | g  | abcdefg | 23400s +-1 |
 		 | g    | a  | abcdefg | 23400s +-1 |
-
+    
+    @todo
 	Scenario: Bike - Ferry duration, individual parts
 		Given the node map
 		  | x | y |  | z |  |  | v |
diff --git a/features/bicycle/names.feature b/features/bicycle/names.feature
index 9bc8dad2d..42273a9be 100644
--- a/features/bicycle/names.feature
+++ b/features/bicycle/names.feature
@@ -19,26 +19,14 @@ Feature: Bike - Street names in instructions
 		 | a    | c  | My Way,Your Way |
 		
 	Scenario: Bike - Use way type to describe unnamed ways
-		Given the node map
-		 | a | b | c |
-
-		And the ways
-		 | nodes | highway  | name |
-		 | ab    | cycleway |      |
-		 | bc    | track    |      |
-
-		When I route I should get
-		 | from | to | route          |
-		 | a    | c  | cycleway,track |
-	
-	Scenario: Bike - Don't create instructions for every node of unnamed ways
 		Given the node map
 		 | a | b | c | d |
 
 		And the ways
 		 | nodes | highway  | name |
-		 | abcd  | cycleway |      |
+		 | ab    | cycleway |      |
+		 | bcd  | track    |      |
 
 		When I route I should get
-		 | from | to | route    |
-		 | a    | d  | cycleway |
\ No newline at end of file
+		 | from | to | route          |
+		 | a    | d  | cycleway,track |
\ No newline at end of file
diff --git a/features/car/names.feature b/features/car/names.feature
index d937b3855..225e0cce2 100644
--- a/features/car/names.feature
+++ b/features/car/names.feature
@@ -10,35 +10,24 @@ Feature: Car - Street names in instructions
 		 |   | c |
 	
 		And the ways
-		 | nodes | name   |
-		 | ab    | My Way |
+		 | nodes | name     |
+		 | ab    | My Way   |
 		 | bc    | Your Way |
     
 		When I route I should get
 		 | from | to | route           |
 		 | a    | c  | My Way,Your Way |
 	
+	@todo
 	Scenario: Car - Use way type to describe unnamed ways
-		Given the node map
-		 | a | b | c |
-
-		And the ways
-		 | nodes | highway     | name |
-		 | ab    | tertiary    |      |
-		 | bc    | residential |      |
-
-		When I route I should get
-		 | from | to | route                |
-		 | a    | c  | tertiary,residential |
-
-	Scenario: Car - Don't create instructions for every node of unnamed ways
 		Given the node map
 		 | a | b | c | d |
 
 		And the ways
-		 | nodes | highway | name |
-		 | abcd  | primary |      |
+		 | nodes | highway     | name |
+		 | ab    | tertiary    |      |
+		 | bcd   | residential |      |
 
 		When I route I should get
-		 | from | to | route   |
-		 | a    | d  | primary |
+		 | from | to | route                |
+		 | a    | c  | tertiary,residential |
diff --git a/features/testbot/ferry.feature b/features/testbot/ferry.feature
index 35b18d04e..f16518ef1 100644
--- a/features/testbot/ferry.feature
+++ b/features/testbot/ferry.feature
@@ -38,7 +38,8 @@ Feature: Testbot - Handle ferry routes
 		 | from | to | route | time      |
 		 | a    | d  | abcd  | 3600s +-1 |
 		 | d    | a  | abcd  | 3600s +-1 |
-
+    
+    @todo
 	Scenario: Bike - Ferry duration, individual parts
 		Given the node map
 		  | x | y |  | z |  |  | v |