diff --git a/vrobbler/apps/locations/utils.py b/vrobbler/apps/locations/utils.py
index 0b15de4..de382af 100644
--- a/vrobbler/apps/locations/utils.py
+++ b/vrobbler/apps/locations/utils.py
@@ -11,8 +11,8 @@ SPEED_THRESHOLDS = {
     "at_rest": 0.5,
     "walking": 1.5,
     "running": 3.5,
-    "bicycling": 9.0,
-    "driving": float("inf"),
+    "bicycling": 6.5,
+    "driving": 10,
 }
 
 # Activity mapping from Android activity recognition