diff --git a/Makefile b/Makefile
index 78ba9217d..0da6b501b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ DOCKER_BUILD= # set to 1 to use `docker-build` instead of `build` when creating
 BUILD_TAGS += shardwidth$(SHARD_WIDTH)
 TEST_TAGS = roaringparanoia
 UNAME := $(shell uname -s)
-TEST_TIMEOUT=30m
-RACE_TEST_TIMEOUT=90m
+TEST_TIMEOUT=10m
+RACE_TEST_TIMEOUT=10m
 ifeq ($(UNAME), Darwin)
     IS_MACOS:=1
 else