diff --git a/openstackclient/tests/api/fakes.py b/openstackclient/tests/api/fakes.py
index 85617ab7d7..e285a61c3c 100644
--- a/openstackclient/tests/api/fakes.py
+++ b/openstackclient/tests/api/fakes.py
@@ -15,7 +15,7 @@
 
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
+from keystoneauth1 import session
 from openstackclient.tests import utils
 
 
diff --git a/openstackclient/tests/api/test_image_v1.py b/openstackclient/tests/api/test_image_v1.py
index 34fcfca443..f347975637 100644
--- a/openstackclient/tests/api/test_image_v1.py
+++ b/openstackclient/tests/api/test_image_v1.py
@@ -15,7 +15,7 @@
 
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
+from keystoneauth1 import session
 from openstackclient.api import image_v1
 from openstackclient.tests import utils
 
diff --git a/openstackclient/tests/api/test_image_v2.py b/openstackclient/tests/api/test_image_v2.py
index ddb160eea5..77063997e2 100644
--- a/openstackclient/tests/api/test_image_v2.py
+++ b/openstackclient/tests/api/test_image_v2.py
@@ -15,7 +15,7 @@
 
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
+from keystoneauth1 import session
 from openstackclient.api import image_v2
 from openstackclient.tests import utils
 
diff --git a/openstackclient/tests/api/test_network_v2.py b/openstackclient/tests/api/test_network_v2.py
index 13c5d6ea17..80f1d9dec0 100644
--- a/openstackclient/tests/api/test_network_v2.py
+++ b/openstackclient/tests/api/test_network_v2.py
@@ -15,7 +15,7 @@
 
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
+from keystoneauth1 import session
 from openstackclient.api import network_v2 as network
 from openstackclient.tests import utils
 
diff --git a/openstackclient/tests/api/test_object_store_v1.py b/openstackclient/tests/api/test_object_store_v1.py
index 0f7c45599f..992bf2617e 100644
--- a/openstackclient/tests/api/test_object_store_v1.py
+++ b/openstackclient/tests/api/test_object_store_v1.py
@@ -17,7 +17,7 @@ import mock
 
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
+from keystoneauth1 import session
 from openstackclient.api import object_store_v1 as object_store
 from openstackclient.tests import utils
 
diff --git a/openstackclient/tests/fakes.py b/openstackclient/tests/fakes.py
index 979f9481dc..357c470f66 100644
--- a/openstackclient/tests/fakes.py
+++ b/openstackclient/tests/fakes.py
@@ -17,7 +17,7 @@ import json
 import six
 import sys
 
-from keystoneclient import fixture
+from keystoneauth1 import fixture
 import requests
 
 
diff --git a/openstackclient/tests/object/v1/fakes.py b/openstackclient/tests/object/v1/fakes.py
index 6aef05b1e8..986ab2f30b 100644
--- a/openstackclient/tests/object/v1/fakes.py
+++ b/openstackclient/tests/object/v1/fakes.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-from keystoneclient import session
+from keystoneauth1 import session
 from openstackclient.api import object_store_v1 as object_store
 from openstackclient.tests import utils
 
diff --git a/requirements.txt b/requirements.txt
index ba7a9e3e8f..ca6a30c56a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ six>=1.9.0
 
 Babel>=1.3
 cliff>=1.14.0 # Apache-2.0
+keystoneauth1>=1.0.0
 os-client-config!=1.6.2,>=1.4.0
 oslo.config>=2.3.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0