diff --git a/Makefile b/Makefile
index 512232c3e5c..a8fcedae034 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ define NEWLINE
 
 endef
 
-TEST_TIMEOUT := 20m
+TEST_TIMEOUT := 30m
 
 
 PROTO_ROOT := proto