diff --git a/test/speedprofiles/bicycle.ini b/test/speedprofiles/bicycle.ini
index adbadfecb..c6f12cec8 100644
--- a/test/speedprofiles/bicycle.ini
+++ b/test/speedprofiles/bicycle.ini
@@ -1,23 +1,28 @@
 [bicycle]
-	cycleway		= 20
-	trunk           = 20
-	trunk_link      = 20
-	primary         = 20
-	primary_link    = 20
-	secondary       = 20
-	secondary_link  = 20
-	tertiary        = 20
-	unclassified    = 18
-	residential     = 18
-	living_street   = 18
-	service         = 15
-	track			= 15
-	path			= 15
-	ferry			= 5
+	cycleway		= 19
+	trunk           = 19
+	trunk_link      = 19
+	primary         = 19
+	primary_link    = 19
+	secondary       = 17
+	secondary_link  = 17
+	tertiary        = 15
+	residential     = 15
+	unclassified    = 15
+	living_street   = 13
+	service         = 12
+	track			= 12
+	path			= 12
+	footway			= 10
+	pedestrian		= 5
 	pier			= 5
 	steps			= 3
+	ferry			= 5
 	obeyOneways		= yes
 	useRestrictions = yes
 	accessTag		= bicycle
 	excludeFromGrid = ferry
-	defaultSpeed	= 15
+	defaultSpeed	= 17
+	obeyBollards	= no
+	trafficLightPenalty = 20
+
diff --git a/test/speedprofiles/ebike.ini b/test/speedprofiles/ebike.ini
new file mode 100644
index 000000000..0ec406061
--- /dev/null
+++ b/test/speedprofiles/ebike.ini
@@ -0,0 +1,25 @@
+[ebike]
+	cycleway		= 25
+	trunk           = 25
+	trunk_link      = 25
+	primary         = 25
+	primary_link    = 25
+	secondary       = 25
+	secondary_link  = 25
+	tertiary        = 25
+	unclassified    = 25
+	residential     = 25
+	living_street   = 20
+	service         = 20
+	track			= 20
+	path			= 15
+	ferry			= 5
+	pier			= 5
+	pedestrian		= 5
+	footway			= 5
+	steps			= 3
+	obeyOneways		= yes
+	useRestrictions = no
+	accessTag		= bicycle
+	excludeFromGrid = ferry
+	defaultSpeed	= 25