diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb
index bcbf77b2..0240ce4b 100644
--- a/lib/puppet/provider/openstack.rb
+++ b/lib/puppet/provider/openstack.rb
@@ -14,8 +14,8 @@ class Puppet::Provider::Openstack < Puppet::Provider
   commands :openstack_command => 'openstack'
 
   @@no_retry_actions = %w(create remove delete)
-  @@command_timeout  = 20
-  # Fails on the 8th retry for a max of 181s (~3min) before total
+  @@command_timeout  = 40
+  # Fails on the 5th retry for a max of 212s (~3.5min) before total
   # failure.
   @@request_timeout  = 170
   @@retry_sleep      = 3
diff --git a/spec/unit/provider/openstack_spec.rb b/spec/unit/provider/openstack_spec.rb
index 766188ed..375df177 100644
--- a/spec/unit/provider/openstack_spec.rb
+++ b/spec/unit/provider/openstack_spec.rb
@@ -103,7 +103,7 @@ name="test"
             .times(3)
         provider.class.stubs(:sleep)
         provider.class.stubs(:current_time)
-            .returns(0, 10, 10, 20, 20, 180, 180)
+            .returns(0, 10, 10, 20, 20, 200, 200)
         expect do
           Puppet::Provider::Openstack.request('project', 'list', ['--long'])
         end.to raise_error Puppet::ExecutionFailure, /Unable to establish connection/