diff --git a/charms_openstack/test_mocks.py b/charms_openstack/test_mocks.py
index c20da4a..6b539a2 100644
--- a/charms_openstack/test_mocks.py
+++ b/charms_openstack/test_mocks.py
@@ -1,5 +1,5 @@
 import sys
-import mock
+from unittest import mock
 
 charmhelpers = None
 
diff --git a/charms_openstack/test_utils.py b/charms_openstack/test_utils.py
index 31cffcb..67be123 100644
--- a/charms_openstack/test_utils.py
+++ b/charms_openstack/test_utils.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import itertools
-import mock
+from unittest import mock
 import unittest
 
 import charmhelpers.core.unitdata as unitdata
diff --git a/test-requirements.txt b/test-requirements.txt
index 681d08b..9e00ae1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,5 +6,4 @@ flake8>=2.2.4
 stestr
 paramiko<2.0
 charms.reactive
-mock>=1.2
 coverage>=3.6
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index 303b4a3..4def149 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import sys
-import mock
+from unittest import mock
 import os
 
 # mock out some charmhelpers libraries as they have apt install side effects
diff --git a/unit_tests/charms_openstack/charm/test_classes.py b/unit_tests/charms_openstack/charm/test_classes.py
index 399f131..b5f57bf 100644
--- a/unit_tests/charms_openstack/charm/test_classes.py
+++ b/unit_tests/charms_openstack/charm/test_classes.py
@@ -1,5 +1,5 @@
 import base64
-import mock
+from unittest import mock
 
 import unit_tests.utils as utils
 from unit_tests.charms_openstack.charm.utils import (
diff --git a/unit_tests/charms_openstack/charm/test_core.py b/unit_tests/charms_openstack/charm/test_core.py
index 66ad6dd..03c6f65 100644
--- a/unit_tests/charms_openstack/charm/test_core.py
+++ b/unit_tests/charms_openstack/charm/test_core.py
@@ -1,5 +1,5 @@
 import collections
-import mock
+from unittest import mock
 import unittest
 
 import charms_openstack.charm.core as chm_core
diff --git a/unit_tests/charms_openstack/charm/test_defaults.py b/unit_tests/charms_openstack/charm/test_defaults.py
index c2efa5e..8a2fbe0 100644
--- a/unit_tests/charms_openstack/charm/test_defaults.py
+++ b/unit_tests/charms_openstack/charm/test_defaults.py
@@ -1,5 +1,5 @@
 import collections
-import mock
+from unittest import mock
 
 import charms_openstack.charm.core as chm_core
 import charms_openstack.charm.defaults as chm
diff --git a/unit_tests/charms_openstack/charm/utils.py b/unit_tests/charms_openstack/charm/utils.py
index 2647901..2046440 100644
--- a/unit_tests/charms_openstack/charm/utils.py
+++ b/unit_tests/charms_openstack/charm/utils.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 import unit_tests.utils
 
diff --git a/unit_tests/charms_openstack/plugins/test_adapters.py b/unit_tests/charms_openstack/plugins/test_adapters.py
index 38c0ddc..8d7e304 100644
--- a/unit_tests/charms_openstack/plugins/test_adapters.py
+++ b/unit_tests/charms_openstack/plugins/test_adapters.py
@@ -21,7 +21,7 @@
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
 
 import unittest
-import mock
+from unittest import mock
 
 import charms_openstack.adapters as c_adapters
 import charms_openstack.plugins.adapters as pl_adapters
diff --git a/unit_tests/charms_openstack/plugins/test_classes.py b/unit_tests/charms_openstack/plugins/test_classes.py
index d427d6d..e613f5e 100644
--- a/unit_tests/charms_openstack/plugins/test_classes.py
+++ b/unit_tests/charms_openstack/plugins/test_classes.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 import subprocess
 
diff --git a/unit_tests/test_charms_openstack_adapters.py b/unit_tests/test_charms_openstack_adapters.py
index f5c90b8..589f0f1 100644
--- a/unit_tests/test_charms_openstack_adapters.py
+++ b/unit_tests/test_charms_openstack_adapters.py
@@ -22,7 +22,7 @@
 
 import copy
 import unittest
-import mock
+from unittest import mock
 
 import charms.reactive as reactive
 
diff --git a/unit_tests/test_charms_openstack_bus.py b/unit_tests/test_charms_openstack_bus.py
index 4306f01..ad93418 100644
--- a/unit_tests/test_charms_openstack_bus.py
+++ b/unit_tests/test_charms_openstack_bus.py
@@ -17,7 +17,7 @@
 import os
 import unittest
 
-import mock
+from unittest import mock
 
 import charms_openstack.bus as bus
 
diff --git a/unit_tests/test_charms_openstack_devices_pci.py b/unit_tests/test_charms_openstack_devices_pci.py
index 825dcbe..15da4dd 100644
--- a/unit_tests/test_charms_openstack_devices_pci.py
+++ b/unit_tests/test_charms_openstack_devices_pci.py
@@ -19,7 +19,7 @@
 # mock out some charmhelpers libraries as they have apt install side effects
 # sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
 # sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
-import mock
+from unittest import mock
 
 import charms_openstack.devices.pci as pci
 import unit_tests.pci_responses as pci_responses
diff --git a/unit_tests/utils.py b/unit_tests/utils.py
index e1d0fb6..57b03a5 100644
--- a/unit_tests/utils.py
+++ b/unit_tests/utils.py
@@ -17,7 +17,7 @@
 
 import contextlib
 import io
-import mock
+from unittest import mock
 import unittest