diff --git a/barbicanclient/test/__init__.py b/barbicanclient/tests/__init__.py
similarity index 100%
rename from barbicanclient/test/__init__.py
rename to barbicanclient/tests/__init__.py
diff --git a/barbicanclient/test/keystone_client_fixtures.py b/barbicanclient/tests/keystone_client_fixtures.py
similarity index 100%
rename from barbicanclient/test/keystone_client_fixtures.py
rename to barbicanclient/tests/keystone_client_fixtures.py
diff --git a/barbicanclient/test/test_barbican.py b/barbicanclient/tests/test_barbican.py
similarity index 98%
rename from barbicanclient/test/test_barbican.py
rename to barbicanclient/tests/test_barbican.py
index f69d9267..6d9561c2 100644
--- a/barbicanclient/test/test_barbican.py
+++ b/barbicanclient/tests/test_barbican.py
@@ -22,8 +22,8 @@ import testtools
 import uuid
 import json
 
-from barbicanclient.test import keystone_client_fixtures
-from barbicanclient.test import test_client
+from barbicanclient.tests import keystone_client_fixtures
+from barbicanclient.tests import test_client
 import barbicanclient.barbican
 
 
diff --git a/barbicanclient/test/test_client.py b/barbicanclient/tests/test_client.py
similarity index 100%
rename from barbicanclient/test/test_client.py
rename to barbicanclient/tests/test_client.py
diff --git a/barbicanclient/test/test_client_containers.py b/barbicanclient/tests/test_containers.py
similarity index 99%
rename from barbicanclient/test/test_client_containers.py
rename to barbicanclient/tests/test_containers.py
index ff2c2ad6..b8a4db87 100644
--- a/barbicanclient/test/test_client_containers.py
+++ b/barbicanclient/tests/test_containers.py
@@ -18,7 +18,7 @@ import json
 import mock
 from oslo_utils import timeutils
 
-from barbicanclient.test import test_client
+from barbicanclient.tests import test_client
 from barbicanclient import base, containers, secrets
 
 
diff --git a/barbicanclient/test/test_client_orders.py b/barbicanclient/tests/test_orders.py
similarity index 98%
rename from barbicanclient/test/test_client_orders.py
rename to barbicanclient/tests/test_orders.py
index 91866d16..34e10437 100644
--- a/barbicanclient/test/test_client_orders.py
+++ b/barbicanclient/tests/test_orders.py
@@ -19,8 +19,8 @@ from oslo_utils import timeutils
 import testtools
 
 from barbicanclient import orders, base
-from barbicanclient.test import test_client
-from barbicanclient.test import test_client_secrets as test_secrets
+from barbicanclient.tests import test_client
+from barbicanclient.tests import test_secrets
 
 
 class OrdersTestCase(test_client.BaseEntityResource):
diff --git a/barbicanclient/test/test_client_secrets.py b/barbicanclient/tests/test_secrets.py
similarity index 99%
rename from barbicanclient/test/test_client_secrets.py
rename to barbicanclient/tests/test_secrets.py
index df526ca0..abed3c22 100644
--- a/barbicanclient/test/test_client_secrets.py
+++ b/barbicanclient/tests/test_secrets.py
@@ -17,7 +17,7 @@ import json
 
 from oslo.utils import timeutils
 
-from barbicanclient.test import test_client
+from barbicanclient.tests import test_client
 from barbicanclient import secrets, base