diff --git a/devstack/create_config b/devstack/create_config
index 398108ee..25462cb3 100755
--- a/devstack/create_config
+++ b/devstack/create_config
@@ -221,10 +221,9 @@ if [[ -n "$openstack_image_id" ]]; then
   openstack $auth server delete $instance_id
 fi
 
-timeout="180"
+timeout="600"
 run_long_tests="False"
 if [[ $RUN_LONG_TESTS == "1" ]]; then
-  timeout="600"
   run_long_tests="True"
 fi