diff --git a/features/investigate/weird.feature b/features/investigate/weird.feature
index 5bf3b9166..33c2d6108 100644
--- a/features/investigate/weird.feature
+++ b/features/investigate/weird.feature
@@ -1,4 +1,4 @@
-@routing @weird
+@routing @weird @todo
 Feature: Weird routings discovered
 
 	Background:
@@ -39,4 +39,41 @@ Feature: Weird routings discovered
 		 | f    | e  | fg,gh,ha,ab,bc,cd,de |
 		 | g    | f  | gh,ha,ab,bc,cd,de,ef |
 		 | h    | g  | ha,ab,bc,cd,de,ef,fg |
-		 | a    | h  | ab,bc,cd,de,ef,fg,gh |
\ No newline at end of file
+		 | a    | h  | ab,bc,cd,de,ef,fg,gh |
+
+	Scenario: Routing on a oneway roundabout
+		Given the node map
+		 |   | d | c |   |
+		 | e |   |   | b |
+		 | f |   |   | a |
+		 |   | g | h |   |
+
+		And the ways
+		 | nodes | oneway |
+		 | ab    | yes    |
+		 | bc    | yes    |
+		 | cd    | yes    |
+		 | de    | yes    |
+		 | ef    | yes    |
+		 | fg    | yes    |
+		 | gh    | yes    |
+		 | ha    | yes    |
+
+		When I route I should get
+		 | from | to | route                |
+		 | a    | b  | ab                   |
+		 | b    | c  | bc                   |
+		 | c    | d  | cd                   |
+		 | d    | e  | de                   |
+		 | e    | f  | ef                   |
+		 | f    | g  | fg                   |
+		 | g    | h  | gh                   |
+		 | h    | a  | ha                   |
+		 | b    | a  | bc,cd,de,ef,fg,gh,ha |
+		 | c    | b  | cd,de,ef,fg,gh,ha,ab |
+		 | d    | c  | de,ef,fg,gh,ha,ab,bc |
+		 | e    | d  | ef,fg,gh,ha,ab,bc,cd |
+		 | f    | e  | fg,gh,ha,ab,bc,cd,de |
+		 | g    | f  | gh,ha,ab,bc,cd,de,ef |
+		 | h    | g  | ha,ab,bc,cd,de,ef,fg |
+		 | a    | h  | ab,bc,cd,de,ef,fg,gh |
diff --git a/features/testbot/basic.feature b/features/testbot/basic.feature
index a64311c61..9ab579f0f 100644
--- a/features/testbot/basic.feature
+++ b/features/testbot/basic.feature
@@ -233,40 +233,3 @@ Feature: Basic Routing
 		 | d    | a  | abcd  |
 		 | a    | m  | aeim  |
 		 | m    | a  | aeim  |
-
-	Scenario: Routing on a oneway roundabout
-		Given the node map
-		 |   | d | c |   |
-		 | e |   |   | b |
-		 | f |   |   | a |
-		 |   | g | h |   |
-
-		And the ways
-		 | nodes | oneway |
-		 | ab    | yes    |
-		 | bc    | yes    |
-		 | cd    | yes    |
-		 | de    | yes    |
-		 | ef    | yes    |
-		 | fg    | yes    |
-		 | gh    | yes    |
-		 | ha    | yes    |
-
-		When I route I should get
-		 | from | to | route                |
-		 | a    | b  | ab                   |
-		 | b    | c  | bc                   |
-		 | c    | d  | cd                   |
-		 | d    | e  | de                   |
-		 | e    | f  | ef                   |
-		 | f    | g  | fg                   |
-		 | g    | h  | gh                   |
-		 | h    | a  | ha                   |
-		 | b    | a  | bc,cd,de,ef,fg,gh,ha |
-		 | c    | b  | cd,de,ef,fg,gh,ha,ab |
-		 | d    | c  | de,ef,fg,gh,ha,ab,bc |
-		 | e    | d  | ef,fg,gh,ha,ab,bc,cd |
-		 | f    | e  | fg,gh,ha,ab,bc,cd,de |
-		 | g    | f  | gh,ha,ab,bc,cd,de,ef |
-		 | h    | g  | ha,ab,bc,cd,de,ef,fg |
-		 | a    | h  | ab,bc,cd,de,ef,fg,gh |