diff --git a/features/testbot/bug.feature b/features/testbot/bug.feature
new file mode 100644
index 000000000..6eb1349e1
--- /dev/null
+++ b/features/testbot/bug.feature
@@ -0,0 +1,23 @@
+@routing @testbot @bug @todo
+Feature: Testbot - Things that looks like bugs
+
+	Background:
+		Given the profile "testbot"
+    
+    Scenario: Testbot - Triangle problem
+    	Given the node map
+    	 |   |   |   | d |
+    	 | a | b | c |   |
+    	 |   |   |   | e |
+
+    	And the ways
+    	 | nodes | highway | oneway |
+    	 | abc   | primary |        |
+    	 | cd    | primary | yes    |
+    	 | ce    | river   |        |
+    	 | de    | primary |        |
+
+    	When I route I should get
+    	 | from | to | route     |
+    	 | d    | c  | de,ce     |
+    	 | e    | d  | de        |
diff --git a/features/testbot/example.feature b/features/testbot/example.feature
new file mode 100644
index 000000000..699d35cb1
--- /dev/null
+++ b/features/testbot/example.feature
@@ -0,0 +1,38 @@
+@routing @testbot @example
+Feature: Testbot - Walkthrough
+
+# A complete walk-through of how this data is processed can be found at:
+# https://github.com/DennisOSRM/Project-OSRM/wiki/Processing-Flow
+
+	Background:
+		Given the profile "testbot"
+    
+    Scenario: Testbot - Processing Flow
+    	Given the node map
+    	 |   |   |   | d |
+    	 | a | b | c |   |
+    	 |   |   |   | e |
+
+    	And the ways
+    	 | nodes | highway | oneway |
+    	 | abc   | primary |        |
+    	 | cd    | primary | yes    |
+    	 | ce    | river   |        |
+    	 | de    | primary |        |
+
+    	When I route I should get
+    	 | from | to | route     |
+    	 | a    | b  | abc       |
+    	 | a    | c  | abc       |
+    	 | a    | d  | abc,cd    |
+    	 | a    | e  | abc,ce    |
+    	 | b    | a  | abc       |
+    	 | b    | c  | abc       |
+    	 | b    | d  | abc,cd    |
+    	 | b    | e  | abc,ce    |
+    	 | d    | a  | de,ce,abc |
+    	 | d    | b  | de,ce,abc |
+    	 | d    | e  | de        |
+    	 | e    | a  | ce,abc    |
+    	 | e    | b  | ce,abc    |
+    	 | e    | c  | ce        |