diff --git a/test/buildbot/buildbot_config/master/buildsteps.py b/test/buildbot/buildbot_config/master/buildsteps.py
index d8a40dab5..962c4387a 100644
--- a/test/buildbot/buildbot_config/master/buildsteps.py
+++ b/test/buildbot/buildbot_config/master/buildsteps.py
@@ -96,4 +96,5 @@ class AcceptanceTests(ShellCommand):
         # Make sure that the proper environment variables for the test
         # get passed through to the slave
         kwargs["env"] = { "ACCEPTANCE_CONFIG": WithProperties("%(acceptance_config_path)s") }
+        kwargs["timeout"] = 3600
         ShellCommand.__init__(self, **kwargs)