diff --git a/tests/base.py b/tests/base.py
index 126119f67..b13455012 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -27,6 +27,12 @@ import operator
 import testtools
 import xml.etree.ElementTree as XML
 from six.moves import configparser
+# This dance deals with the fact that we want unittest.mock if
+# we're on Python 3.4 and later, and non-stdlib mock otherwise.
+try:
+    from unittest import mock
+except ImportError:
+    import mock  # noqa
 import jenkins_jobs.local_yaml as yaml
 from jenkins_jobs.builder import XmlJob, YamlParser, ModuleRegistry
 from jenkins_jobs.modules import (project_flow,
diff --git a/tests/cachestorage/test_cachestorage.py b/tests/cachestorage/test_cachestorage.py
index 6eb678f9a..773a90e1f 100644
--- a/tests/cachestorage/test_cachestorage.py
+++ b/tests/cachestorage/test_cachestorage.py
@@ -13,10 +13,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 import testtools
 
 import jenkins_jobs
+from tests.base import mock
 
 
 class TestCaseCacheStorage(testtools.TestCase):
diff --git a/tests/cmd/subcommands/test_delete.py b/tests/cmd/subcommands/test_delete.py
index f4521eafe..ba2c8aaeb 100644
--- a/tests/cmd/subcommands/test_delete.py
+++ b/tests/cmd/subcommands/test_delete.py
@@ -1,6 +1,6 @@
 import os
-import mock
 from jenkins_jobs import cmd
+from tests.base import mock
 from tests.cmd.test_cmd import CmdTestsBase
 
 
diff --git a/tests/cmd/subcommands/test_test.py b/tests/cmd/subcommands/test_test.py
index 43c000c56..7740bf686 100644
--- a/tests/cmd/subcommands/test_test.py
+++ b/tests/cmd/subcommands/test_test.py
@@ -1,8 +1,8 @@
 import os
 import io
 import codecs
-import mock
 from jenkins_jobs import cmd
+from tests.base import mock
 from tests.cmd.test_cmd import CmdTestsBase
 
 
diff --git a/tests/cmd/test_cmd.py b/tests/cmd/test_cmd.py
index fac682a20..a2248fe88 100644
--- a/tests/cmd/test_cmd.py
+++ b/tests/cmd/test_cmd.py
@@ -1,8 +1,8 @@
 import os
 from six.moves import configparser, StringIO
-import mock
 import testtools
 from jenkins_jobs import cmd
+from tests.base import mock
 
 
 class CmdTestsBase(testtools.TestCase):
diff --git a/tests/duplicates/test_duplicates.py b/tests/duplicates/test_duplicates.py
index 1f84ad387..e54861ab8 100644
--- a/tests/duplicates/test_duplicates.py
+++ b/tests/duplicates/test_duplicates.py
@@ -14,11 +14,14 @@
 # under the License.
 
 import os
-import mock
+
 from testtools import TestCase, ExpectedException
 from testscenarios.testcase import TestWithScenarios
-from tests.base import get_scenarios, SingleJobTestCase
+
 from jenkins_jobs.errors import JenkinsJobsException
+from tests.base import SingleJobTestCase
+from tests.base import get_scenarios
+from tests.base import mock
 
 
 class TestCaseModuleDuplicates(TestWithScenarios, TestCase,