diff --git a/setup.py b/setup.py
index 2c0af7e..52643a2 100644
--- a/setup.py
+++ b/setup.py
@@ -11,8 +11,7 @@
 ]
 
 tests_require = [
-    'jinja2',
-    'mock',
+    'jinja2<3.0',
 ]
 
 extras_require = {
diff --git a/tests/command_tests.py b/tests/command_tests.py
index 99e00e2..8bda525 100644
--- a/tests/command_tests.py
+++ b/tests/command_tests.py
@@ -1,10 +1,10 @@
 from tempfile import mkdtemp
+from unittest.mock import Mock, patch
 import mailbox
 import os
 import sys
 
 from click import testing
-from mock import Mock, patch
 
 from salmon import queue, commands, encoding, mail, routing, utils
 
diff --git a/tests/confirm_tests.py b/tests/confirm_tests.py
index 0570d30..377ca99 100644
--- a/tests/confirm_tests.py
+++ b/tests/confirm_tests.py
@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from salmon import mail, view
 from salmon.confirm import ConfirmationEngine, ConfirmationStorage
diff --git a/tests/encoding_tests.py b/tests/encoding_tests.py
index c7b6d5b..f5b4546 100644
--- a/tests/encoding_tests.py
+++ b/tests/encoding_tests.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from email import encoders
 from email.utils import parseaddr
+from unittest.mock import Mock, patch
 import mailbox
 import os
 
-from mock import Mock, patch
 import chardet
 
 from salmon import encoding
diff --git a/tests/handler_tests.py b/tests/handler_tests.py
index e08c7cf..5f9ff5b 100644
--- a/tests/handler_tests.py
+++ b/tests/handler_tests.py
@@ -1,7 +1,6 @@
+from unittest.mock import Mock
 import sys
 
-from mock import Mock
-
 from salmon import mail, utils
 from salmon.routing import Router
 
diff --git a/tests/queue_tests.py b/tests/queue_tests.py
index 4551be2..4c04ef1 100644
--- a/tests/queue_tests.py
+++ b/tests/queue_tests.py
@@ -1,9 +1,8 @@
+from unittest.mock import Mock, patch
 import mailbox
 import os
 import shutil
 
-from mock import Mock, patch
-
 from salmon import mail, queue
 
 from .setup_env import SalmonTestCase
diff --git a/tests/routing_tests.py b/tests/routing_tests.py
index 07a37f3..72b804c 100644
--- a/tests/routing_tests.py
+++ b/tests/routing_tests.py
@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from salmon import routing
 from salmon.mail import MailRequest
diff --git a/tests/server_tests.py b/tests/server_tests.py
index 068162c..92c8d15 100644
--- a/tests/server_tests.py
+++ b/tests/server_tests.py
@@ -1,8 +1,8 @@
 # Copyright (C) 2008 Zed A. Shaw.  Licensed under the terms of the GPLv3.
+from unittest.mock import Mock, call, patch
 import socket
 import sys
 
-from mock import Mock, call, patch
 import lmtpd
 
 from salmon import mail, queue, routing, server
diff --git a/tests/testing_tests.py b/tests/testing_tests.py
index ef1f3a2..237b5ee 100644
--- a/tests/testing_tests.py
+++ b/tests/testing_tests.py
@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from salmon.testing import RouterConversation, assert_in_state, clear_queue, delivered, queue, relay
 
diff --git a/tests/utils_tests.py b/tests/utils_tests.py
index 401488d..a8eb808 100644
--- a/tests/utils_tests.py
+++ b/tests/utils_tests.py
@@ -1,9 +1,8 @@
 from tempfile import mkdtemp
 from unittest import TestCase
+from unittest.mock import patch
 import os
 
-from mock import patch
-
 from salmon import utils
 
 from .setup_env import SalmonTestCase