diff --git a/solum/tests/api/camp/test_camp_v1_1_endpoint.py b/solum/tests/api/camp/test_camp_v1_1_endpoint.py
index 263405a1c..d0361bdf6 100644
--- a/solum/tests/api/camp/test_camp_v1_1_endpoint.py
+++ b/solum/tests/api/camp/test_camp_v1_1_endpoint.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp import camp_v1_1_endpoint
 from solum import objects
diff --git a/solum/tests/api/camp/test_platform_endpoints.py b/solum/tests/api/camp/test_platform_endpoints.py
index 8ec772447..14a1bde7c 100644
--- a/solum/tests/api/camp/test_platform_endpoints.py
+++ b/solum/tests/api/camp/test_platform_endpoints.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp import platform_endpoints
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_assemblies.py b/solum/tests/api/camp/v1_1/test_assemblies.py
index 2ffc15021..7b062ac31 100644
--- a/solum/tests/api/camp/v1_1/test_assemblies.py
+++ b/solum/tests/api/camp/v1_1/test_assemblies.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.camp.v1_1 import assemblies
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_attribute_definitions.py b/solum/tests/api/camp/v1_1/test_attribute_definitions.py
index 8db00628b..0d448d4bb 100644
--- a/solum/tests/api/camp/v1_1/test_attribute_definitions.py
+++ b/solum/tests/api/camp/v1_1/test_attribute_definitions.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import attribute_definitions
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_extensions.py b/solum/tests/api/camp/v1_1/test_extensions.py
index c9e55928c..f76408a3c 100644
--- a/solum/tests/api/camp/v1_1/test_extensions.py
+++ b/solum/tests/api/camp/v1_1/test_extensions.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import extensions
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_formats.py b/solum/tests/api/camp/v1_1/test_formats.py
index b81e3d299..5244d2ba2 100644
--- a/solum/tests/api/camp/v1_1/test_formats.py
+++ b/solum/tests/api/camp/v1_1/test_formats.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import formats
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_parameter_definitions.py b/solum/tests/api/camp/v1_1/test_parameter_definitions.py
index 6928e0a46..1389a74ee 100644
--- a/solum/tests/api/camp/v1_1/test_parameter_definitions.py
+++ b/solum/tests/api/camp/v1_1/test_parameter_definitions.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import parameter_definitions as pd
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_plans.py b/solum/tests/api/camp/v1_1/test_plans.py
index a7c20555c..a54cbc6f5 100644
--- a/solum/tests/api/camp/v1_1/test_plans.py
+++ b/solum/tests/api/camp/v1_1/test_plans.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import plans
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_platform.py b/solum/tests/api/camp/v1_1/test_platform.py
index 0a81a5d1b..131f85c05 100644
--- a/solum/tests/api/camp/v1_1/test_platform.py
+++ b/solum/tests/api/camp/v1_1/test_platform.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import platform
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_services.py b/solum/tests/api/camp/v1_1/test_services.py
index 0b791cf93..64b245c55 100644
--- a/solum/tests/api/camp/v1_1/test_services.py
+++ b/solum/tests/api/camp/v1_1/test_services.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1 import services
 from solum import objects
diff --git a/solum/tests/api/camp/v1_1/test_type_definitions.py b/solum/tests/api/camp/v1_1/test_type_definitions.py
index 3008ecb04..a32c75a6b 100644
--- a/solum/tests/api/camp/v1_1/test_type_definitions.py
+++ b/solum/tests/api/camp/v1_1/test_type_definitions.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.camp.v1_1.datamodel import attribute_definitions
 from solum.api.controllers.camp.v1_1.datamodel import type_definitions as model
diff --git a/solum/tests/api/controllers/v1/test_app.py b/solum/tests/api/controllers/v1/test_app.py
index 2fca46d90..19bd5804f 100644
--- a/solum/tests/api/controllers/v1/test_app.py
+++ b/solum/tests/api/controllers/v1/test_app.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1 import app
 from solum.common import exception
diff --git a/solum/tests/api/controllers/v1/test_assembly.py b/solum/tests/api/controllers/v1/test_assembly.py
index d5d78d97f..eb9614eda 100644
--- a/solum/tests/api/controllers/v1/test_assembly.py
+++ b/solum/tests/api/controllers/v1/test_assembly.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1 import assembly
 from solum.api.controllers.v1.datamodel import assembly as assemblymodel
diff --git a/solum/tests/api/controllers/v1/test_component.py b/solum/tests/api/controllers/v1/test_component.py
index 8b2e9fccb..12b1a32c1 100644
--- a/solum/tests/api/controllers/v1/test_component.py
+++ b/solum/tests/api/controllers/v1/test_component.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1 import component
 from solum.api.controllers.v1.datamodel import component as componentmodel
diff --git a/solum/tests/api/controllers/v1/test_exceptions.py b/solum/tests/api/controllers/v1/test_exceptions.py
index 91e4e8491..223f32f1f 100644
--- a/solum/tests/api/controllers/v1/test_exceptions.py
+++ b/solum/tests/api/controllers/v1/test_exceptions.py
@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import pecan
+from unittest import mock
 import wsme
 import wsmeext.pecan as wsme_pecan
 
diff --git a/solum/tests/api/controllers/v1/test_extension.py b/solum/tests/api/controllers/v1/test_extension.py
index 53342b412..e0363fc36 100644
--- a/solum/tests/api/controllers/v1/test_extension.py
+++ b/solum/tests/api/controllers/v1/test_extension.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1.datamodel import extension as model
 from solum.api.controllers.v1 import extension as controller
diff --git a/solum/tests/api/controllers/v1/test_infrastructure.py b/solum/tests/api/controllers/v1/test_infrastructure.py
index e813bef74..a5d2d9a4e 100644
--- a/solum/tests/api/controllers/v1/test_infrastructure.py
+++ b/solum/tests/api/controllers/v1/test_infrastructure.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1.datamodel import infrastructure as inframodel
 from solum.api.controllers.v1 import infrastructure
diff --git a/solum/tests/api/controllers/v1/test_language_pack.py b/solum/tests/api/controllers/v1/test_language_pack.py
index c72b82bd6..e96eddae4 100644
--- a/solum/tests/api/controllers/v1/test_language_pack.py
+++ b/solum/tests/api/controllers/v1/test_language_pack.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1 import language_pack
 from solum.common import exception
diff --git a/solum/tests/api/controllers/v1/test_operation.py b/solum/tests/api/controllers/v1/test_operation.py
index 4b430969b..4c5696912 100644
--- a/solum/tests/api/controllers/v1/test_operation.py
+++ b/solum/tests/api/controllers/v1/test_operation.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1.datamodel import operation as operationmodel
 from solum.api.controllers.v1 import operation
diff --git a/solum/tests/api/controllers/v1/test_pipeline.py b/solum/tests/api/controllers/v1/test_pipeline.py
index 329a2b811..bbdddd08f 100644
--- a/solum/tests/api/controllers/v1/test_pipeline.py
+++ b/solum/tests/api/controllers/v1/test_pipeline.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1.datamodel import pipeline as pipelinemodel
 from solum.api.controllers.v1 import pipeline
diff --git a/solum/tests/api/controllers/v1/test_plan.py b/solum/tests/api/controllers/v1/test_plan.py
index 314bd74dd..0a7e134f6 100644
--- a/solum/tests/api/controllers/v1/test_plan.py
+++ b/solum/tests/api/controllers/v1/test_plan.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 from oslo_db import exception as db_exc
 import pecan
 import yaml
diff --git a/solum/tests/api/controllers/v1/test_sensor.py b/solum/tests/api/controllers/v1/test_sensor.py
index bd8a5f1cb..e3d7a5e1d 100644
--- a/solum/tests/api/controllers/v1/test_sensor.py
+++ b/solum/tests/api/controllers/v1/test_sensor.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1.datamodel import sensor as model
 from solum.api.controllers.v1 import sensor as controller
diff --git a/solum/tests/api/controllers/v1/test_service.py b/solum/tests/api/controllers/v1/test_service.py
index 677306e27..a33e6308e 100644
--- a/solum/tests/api/controllers/v1/test_service.py
+++ b/solum/tests/api/controllers/v1/test_service.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.controllers.v1.datamodel import service as servicemodel
 from solum.api.controllers.v1 import service
diff --git a/solum/tests/api/controllers/v1/test_trigger.py b/solum/tests/api/controllers/v1/test_trigger.py
index 9f85977f5..b33073f46 100644
--- a/solum/tests/api/controllers/v1/test_trigger.py
+++ b/solum/tests/api/controllers/v1/test_trigger.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 
 from solum.api.controllers.v1 import trigger
diff --git a/solum/tests/api/controllers/v1/test_userlog.py b/solum/tests/api/controllers/v1/test_userlog.py
index 1c8717ca1..ddc2ea2fa 100644
--- a/solum/tests/api/controllers/v1/test_userlog.py
+++ b/solum/tests/api/controllers/v1/test_userlog.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.controllers.v1 import userlog
 from solum import objects
diff --git a/solum/tests/api/handlers/test_app.py b/solum/tests/api/handlers/test_app.py
index 1a19d4691..dc75c2ebb 100644
--- a/solum/tests/api/handlers/test_app.py
+++ b/solum/tests/api/handlers/test_app.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.handlers import app_handler
 from solum.common import exception as exc
diff --git a/solum/tests/api/handlers/test_assembly.py b/solum/tests/api/handlers/test_assembly.py
index c64203811..6affceb58 100644
--- a/solum/tests/api/handlers/test_assembly.py
+++ b/solum/tests/api/handlers/test_assembly.py
@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import fixture as config
 
 from solum.api import auth
diff --git a/solum/tests/api/handlers/test_component.py b/solum/tests/api/handlers/test_component.py
index 3edd049f1..aa4cb58ed 100644
--- a/solum/tests/api/handlers/test_component.py
+++ b/solum/tests/api/handlers/test_component.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.handlers import component_handler
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_extension.py b/solum/tests/api/handlers/test_extension.py
index 72e35dbec..285393460 100644
--- a/solum/tests/api/handlers/test_extension.py
+++ b/solum/tests/api/handlers/test_extension.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.handlers import extension_handler as extension
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_infrastructure.py b/solum/tests/api/handlers/test_infrastructure.py
index e46d5c136..e11cd56e9 100644
--- a/solum/tests/api/handlers/test_infrastructure.py
+++ b/solum/tests/api/handlers/test_infrastructure.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.handlers import infrastructure_handler as infra
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_lp_handler.py b/solum/tests/api/handlers/test_lp_handler.py
index e86ba953b..d67f7d575 100644
--- a/solum/tests/api/handlers/test_lp_handler.py
+++ b/solum/tests/api/handlers/test_lp_handler.py
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from solum.api.handlers import language_pack_handler
diff --git a/solum/tests/api/handlers/test_operation.py b/solum/tests/api/handlers/test_operation.py
index f867ab843..96d38c592 100644
--- a/solum/tests/api/handlers/test_operation.py
+++ b/solum/tests/api/handlers/test_operation.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.handlers import operation_handler as operation
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_pipeline.py b/solum/tests/api/handlers/test_pipeline.py
index f0b9d36be..796aaec51 100644
--- a/solum/tests/api/handlers/test_pipeline.py
+++ b/solum/tests/api/handlers/test_pipeline.py
@@ -12,8 +12,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.handlers import pipeline_handler
 from solum.common import catalog
diff --git a/solum/tests/api/handlers/test_plan.py b/solum/tests/api/handlers/test_plan.py
index 33c145f6a..bd77d5d2b 100644
--- a/solum/tests/api/handlers/test_plan.py
+++ b/solum/tests/api/handlers/test_plan.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.handlers import plan_handler
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_sensor.py b/solum/tests/api/handlers/test_sensor.py
index e2fef9593..569c7cd36 100644
--- a/solum/tests/api/handlers/test_sensor.py
+++ b/solum/tests/api/handlers/test_sensor.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.handlers import sensor_handler as sensor
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_service.py b/solum/tests/api/handlers/test_service.py
index 6f2ff375f..b6bf36c8b 100644
--- a/solum/tests/api/handlers/test_service.py
+++ b/solum/tests/api/handlers/test_service.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.api.handlers import service_handler
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_userlog.py b/solum/tests/api/handlers/test_userlog.py
index f1de342ac..65e36eaa2 100644
--- a/solum/tests/api/handlers/test_userlog.py
+++ b/solum/tests/api/handlers/test_userlog.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from solum.api.handlers import userlog_handler
 from solum.tests import base
diff --git a/solum/tests/api/handlers/test_workflow.py b/solum/tests/api/handlers/test_workflow.py
index cd95c43ef..dec996984 100644
--- a/solum/tests/api/handlers/test_workflow.py
+++ b/solum/tests/api/handlers/test_workflow.py
@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import fixture as config
 
 from solum.api import auth
diff --git a/solum/tests/api/test_auth.py b/solum/tests/api/test_auth.py
index ed5bc916f..3628d564f 100644
--- a/solum/tests/api/test_auth.py
+++ b/solum/tests/api/test_auth.py
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import fixture as config
 
 from solum.api import auth
diff --git a/solum/tests/common/rpc/test_service.py b/solum/tests/common/rpc/test_service.py
index d638a7473..e147bba40 100644
--- a/solum/tests/common/rpc/test_service.py
+++ b/solum/tests/common/rpc/test_service.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.common.rpc import service
 from solum.tests import base
diff --git a/solum/tests/common/test_catalog.py b/solum/tests/common/test_catalog.py
index e89a3744f..a1e986eca 100644
--- a/solum/tests/common/test_catalog.py
+++ b/solum/tests/common/test_catalog.py
@@ -13,8 +13,8 @@
 # under the License.
 
 import os.path
+from unittest import mock
 
-import mock
 
 from solum.common import catalog
 from solum.common import exception
diff --git a/solum/tests/common/test_clients.py b/solum/tests/common/test_clients.py
index a66540b07..3a4d1c8df 100644
--- a/solum/tests/common/test_clients.py
+++ b/solum/tests/common/test_clients.py
@@ -13,11 +13,12 @@
 from barbicanclient import client as barbicanclient
 from glanceclient import client as glanceclient
 from heatclient import client as heatclient
+from unittest import mock
+
 from keystoneclient.auth.identity import v2 as identity_v2
 from keystoneclient import exceptions
 from keystoneclient import session
 from mistralclient.api import client as mistralclient
-import mock
 from neutronclient.neutron import client as neutronclient
 from oslo_config import cfg
 from swiftclient import client as swiftclient
diff --git a/solum/tests/common/test_exception_base.py b/solum/tests/common/test_exception_base.py
index ee87654f6..f8223ac2e 100644
--- a/solum/tests/common/test_exception_base.py
+++ b/solum/tests/common/test_exception_base.py
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 import wsme
 
diff --git a/solum/tests/common/test_hacking.py b/solum/tests/common/test_hacking.py
index 545b3d78a..4cf485839 100644
--- a/solum/tests/common/test_hacking.py
+++ b/solum/tests/common/test_hacking.py
@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import pycodestyle
+from unittest import mock
 
 import textwrap
 
diff --git a/solum/tests/common/test_solum_keystoneclient.py b/solum/tests/common/test_solum_keystoneclient.py
index b7c221b11..26abba5e9 100644
--- a/solum/tests/common/test_solum_keystoneclient.py
+++ b/solum/tests/common/test_solum_keystoneclient.py
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 import keystoneclient.exceptions as kc_exception  # noqa
diff --git a/solum/tests/common/test_solum_swiftclient.py b/solum/tests/common/test_solum_swiftclient.py
index 0eab70335..627ea5c8f 100644
--- a/solum/tests/common/test_solum_swiftclient.py
+++ b/solum/tests/common/test_solum_swiftclient.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.common import exception as exc
 from solum.common import solum_swiftclient as swiftclient
diff --git a/solum/tests/common/test_urlfetch.py b/solum/tests/common/test_urlfetch.py
index f619fa3c3..c7ea25e10 100644
--- a/solum/tests/common/test_urlfetch.py
+++ b/solum/tests/common/test_urlfetch.py
@@ -11,8 +11,8 @@
 #    under the License.
 
 from io import StringIO
-import mock
 from requests import exceptions
+from unittest import mock
 import urllib
 
 from solum.common import urlfetch
diff --git a/solum/tests/common/test_yamlutils.py b/solum/tests/common/test_yamlutils.py
index 6d0bfd3a8..6aa239254 100644
--- a/solum/tests/common/test_yamlutils.py
+++ b/solum/tests/common/test_yamlutils.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 import yaml
 
 from solum.common import yamlutils
diff --git a/solum/tests/conductor/handlers/test_default.py b/solum/tests/conductor/handlers/test_default.py
index 8704a4c96..19e38632b 100644
--- a/solum/tests/conductor/handlers/test_default.py
+++ b/solum/tests/conductor/handlers/test_default.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.conductor.handlers import default
 from solum.tests import base
diff --git a/solum/tests/deployer/handlers/test_heat.py b/solum/tests/deployer/handlers/test_heat.py
index 63954ffbf..f92a32974 100644
--- a/solum/tests/deployer/handlers/test_heat.py
+++ b/solum/tests/deployer/handlers/test_heat.py
@@ -13,9 +13,9 @@
 # under the License.
 
 import json
+from unittest import mock
 
 from heatclient import exc
-import mock
 from oslo_config import cfg
 import yaml
 
diff --git a/solum/tests/deployer/handlers/test_noop.py b/solum/tests/deployer/handlers/test_noop.py
index a3cc0c007..46fcc4c80 100644
--- a/solum/tests/deployer/handlers/test_noop.py
+++ b/solum/tests/deployer/handlers/test_noop.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.deployer.handlers import noop as noop_handler
 from solum.i18n import _
diff --git a/solum/tests/fakes.py b/solum/tests/fakes.py
index ef5630c66..2fcac8085 100644
--- a/solum/tests/fakes.py
+++ b/solum/tests/fakes.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_utils import uuidutils
 
 
diff --git a/solum/tests/objects/test_assembly.py b/solum/tests/objects/test_assembly.py
index 0a95addd0..968cf26da 100644
--- a/solum/tests/objects/test_assembly.py
+++ b/solum/tests/objects/test_assembly.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 from sqlalchemy.orm import exc as sqla_ex
+from unittest import mock
 
 from solum.common import exception
 from solum.objects import registry
diff --git a/solum/tests/objects/test_image.py b/solum/tests/objects/test_image.py
index c9baef7c5..8e451f0b6 100644
--- a/solum/tests/objects/test_image.py
+++ b/solum/tests/objects/test_image.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 from sqlalchemy.orm import exc
+from unittest import mock
 
 from solum import objects
 from solum.objects import registry
diff --git a/solum/tests/test_db_manage.py b/solum/tests/test_db_manage.py
index dbc5504d2..6bceb0eb1 100644
--- a/solum/tests/test_db_manage.py
+++ b/solum/tests/test_db_manage.py
@@ -12,8 +12,8 @@
 #    under the License.
 
 import sys
+from unittest import mock
 
-import mock
 
 from solum.cmd import db_manage as cli
 from solum.tests import base
diff --git a/solum/tests/uploaders/test_common.py b/solum/tests/uploaders/test_common.py
index 148b76ff4..d2dd06f31 100644
--- a/solum/tests/uploaders/test_common.py
+++ b/solum/tests/uploaders/test_common.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.tests import base
 from solum.tests import fakes
diff --git a/solum/tests/uploaders/test_local.py b/solum/tests/uploaders/test_local.py
index 4bc8eef58..6d8b9d38f 100644
--- a/solum/tests/uploaders/test_local.py
+++ b/solum/tests/uploaders/test_local.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.tests import base
 from solum.tests import fakes
diff --git a/solum/tests/uploaders/test_swift.py b/solum/tests/uploaders/test_swift.py
index 68203bdb2..cb78851ff 100644
--- a/solum/tests/uploaders/test_swift.py
+++ b/solum/tests/uploaders/test_swift.py
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from solum.tests import base
diff --git a/solum/tests/worker/handlers/test_noop.py b/solum/tests/worker/handlers/test_noop.py
index 0578540a8..04e1617bd 100644
--- a/solum/tests/worker/handlers/test_noop.py
+++ b/solum/tests/worker/handlers/test_noop.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from solum.i18n import _
 from solum.tests import base
diff --git a/solum/tests/worker/handlers/test_shell.py b/solum/tests/worker/handlers/test_shell.py
index 952789090..62e8c5966 100644
--- a/solum/tests/worker/handlers/test_shell.py
+++ b/solum/tests/worker/handlers/test_shell.py
@@ -15,8 +15,8 @@
 import base64
 import json
 import os.path
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import uuidutils
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 96dd3bcd2..6d5170255 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0
 coverage>=4.5.1 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 lxml>=4.1.1 # BSD
-mock>=2.0.0 # BSD
 oslotest>=3.3.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 stevedore>=1.28.0 # Apache-2.0