diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index a184c7671d..70c791b2e5 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -752,7 +752,7 @@
 
 # Timeout in seconds to wait for a stack to build. (integer
 # value)
-#build_timeout=600
+#build_timeout=1200
 
 # Instance type for tests. Needs to be big enough for a full
 # OS plus the test workload (string value)
diff --git a/tempest/config.py b/tempest/config.py
index c0ab3237e0..b9fe5728bb 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -559,7 +559,7 @@ OrchestrationGroup = [
                default=1,
                help="Time in seconds between build status checks."),
     cfg.IntOpt('build_timeout',
-               default=600,
+               default=1200,
                help="Timeout in seconds to wait for a stack to build."),
     cfg.StrOpt('instance_type',
                default='m1.micro',