diff --git a/openstack/tests/base.py b/openstack/tests/base.py
index 3db9a0dac..02b8e8965 100644
--- a/openstack/tests/base.py
+++ b/openstack/tests/base.py
@@ -37,13 +37,13 @@ class TestCase(base.BaseTestCase):
     def setUp(self):
         """Run before each test method to initialize test environment."""
         # No openstacksdk unit tests should EVER run longer than a second.
-        # Set this to 3 by default just to give us some fudge.
+        # Set this to 5 by default just to give us some fudge.
         # Do this before super setUp so that we intercept the default value
         # in oslotest. TODO(mordred) Make the default timeout configurable
         # in oslotest.
         self.useFixture(
             fixtures.EnvironmentVariable(
-                'OS_TEST_TIMEOUT', os.environ.get('OS_TEST_TIMEOUT', '3')))
+                'OS_TEST_TIMEOUT', os.environ.get('OS_TEST_TIMEOUT', '5')))
 
         super(TestCase, self).setUp()
 
diff --git a/openstack/tests/functional/cloud/test_compute.py b/openstack/tests/functional/cloud/test_compute.py
index 8e12cd3b2..0e0f17986 100644
--- a/openstack/tests/functional/cloud/test_compute.py
+++ b/openstack/tests/functional/cloud/test_compute.py
@@ -30,7 +30,7 @@ from openstack import utils
 
 class TestCompute(base.BaseFunctionalTestCase):
     def setUp(self):
-        # OS_TEST_TIMEOUT is 60 sec by default
+        # OS_TEST_TIMEOUT is 90 sec by default
         # but on a bad day, test_attach_detach_volume can take more time.
         self.TIMEOUT_SCALING_FACTOR = 1.5
 
diff --git a/tox.ini b/tox.ini
index 27bed5ce3..90d029476 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,7 @@ commands = stestr --test-path ./openstack/tests/examples run {posargs}
 basepython = {env:OPENSTACKSDK_TOX_PYTHON:python2}
 setenv =
     {[testenv]setenv}
-    OS_TEST_TIMEOUT=60
+    OS_TEST_TIMEOUT=90
 commands = stestr --test-path ./openstack/tests/functional run --serial {posargs}
            stestr slowest