diff --git a/Makefile.common b/Makefile.common
index 99e8f9f1b3..9db64a4a25 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -118,6 +118,8 @@ ifeq ($(GOHOSTARCH),amd64)
         endif
 endif
 
+test-flags += "-timeout 20m"
+
 # This rule is used to forward a target like "build" to "common-build".  This
 # allows a new "build" target to be defined in a Makefile which includes this
 # one and override "common-build" without override warnings.