diff --git a/.travis.yml b/.travis.yml
index 768c02c..de5c26d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,4 @@ python:
 dist:
   - xenial
 install: pip install . && pip install -r dev-requirements.txt
-script: py.test
+script: pytest
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 8b96c7a..5a03bfd 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -5,3 +5,4 @@ sphinxcontrib-napoleon>=0.6.1
 sphinxcontrib-zopeext>=0.2.1
 pytest>=4.1.0
 pytest-asyncio>=0.10.0
+pytest-cov>=2.6.1
diff --git a/kademlia/tests/conftest.py b/kademlia/tests/conftest.py
index 7b4c626..ae49098 100644
--- a/kademlia/tests/conftest.py
+++ b/kademlia/tests/conftest.py
@@ -1,6 +1,12 @@
+import random
+import hashlib
+from struct import pack
+
 import pytest
 
 from kademlia.network import Server
+from kademlia.node import Node
+from kademlia.routing import RoutingTable
 
 
 @pytest.yield_fixture
@@ -12,3 +18,40 @@ def bootstrap_node(event_loop):
         yield ('127.0.0.1', 8468)
     finally:
         server.stop()
+
+
+# pylint: disable=redefined-outer-name
+@pytest.fixture()
+def mknode():
+    def _mknode(node_id=None, ip_addy=None, port=None, intid=None):
+        """
+        Make a node.  Created a random id if not specified.
+        """
+        if intid is not None:
+            node_id = pack('>l', intid)
+        if not node_id:
+            randbits = str(random.getrandbits(255))
+            node_id = hashlib.sha1(randbits.encode()).digest()
+        return Node(node_id, ip_addy, port)
+    return _mknode
+
+
+# pylint: disable=too-few-public-methods
+class FakeProtocol:  # pylint: disable=too-few-public-methods
+    def __init__(self, source_id, ksize=20):
+        self.router = RoutingTable(self, ksize, Node(source_id))
+        self.storage = {}
+        self.source_id = source_id
+
+
+# pylint: disable=too-few-public-methods
+class FakeServer:
+    def __init__(self, node_id):
+        self.id = node_id  # pylint: disable=invalid-name
+        self.protocol = FakeProtocol(self.id)
+        self.router = self.protocol.router
+
+
+@pytest.fixture
+def fake_server(mknode):
+    return FakeServer(mknode().id)
diff --git a/kademlia/tests/test_linting.py b/kademlia/tests/test_linting.py
index 3998423..37c97a7 100644
--- a/kademlia/tests/test_linting.py
+++ b/kademlia/tests/test_linting.py
@@ -1,4 +1,3 @@
-import unittest
 from glob import glob
 
 import pycodestyle
@@ -10,7 +9,7 @@ class LintError(Exception):
     pass
 
 
-class TestCodeLinting(unittest.TestCase):
+class TestCodeLinting:
     # pylint: disable=no-self-use
     def test_pylint(self):
         (stdout, _) = lint.py_run('kademlia', return_std=True)
diff --git a/kademlia/tests/test_node.py b/kademlia/tests/test_node.py
index 12b0dac..2a33f23 100644
--- a/kademlia/tests/test_node.py
+++ b/kademlia/tests/test_node.py
@@ -1,56 +1,54 @@
-import unittest
 import random
 import hashlib
 
 
 from kademlia.node import Node, NodeHeap
-from kademlia.tests.utils import mknode
 
 
-class NodeTest(unittest.TestCase):
-    def test_long_id(self):
+class TestNode:
+    def test_long_id(self):  # pylint: disable=no-self-use
         rid = hashlib.sha1(str(random.getrandbits(255)).encode()).digest()
         node = Node(rid)
-        self.assertEqual(node.long_id, int(rid.hex(), 16))
+        assert node.long_id == int(rid.hex(), 16)
 
-    def test_distance_calculation(self):
+    def test_distance_calculation(self):  # pylint: disable=no-self-use
         ridone = hashlib.sha1(str(random.getrandbits(255)).encode())
         ridtwo = hashlib.sha1(str(random.getrandbits(255)).encode())
 
         shouldbe = int(ridone.hexdigest(), 16) ^ int(ridtwo.hexdigest(), 16)
         none = Node(ridone.digest())
         ntwo = Node(ridtwo.digest())
-        self.assertEqual(none.distance_to(ntwo), shouldbe)
+        assert none.distance_to(ntwo) == shouldbe
 
 
-class NodeHeapTest(unittest.TestCase):
-    def test_max_size(self):
+class TestNodeHeap:
+    def test_max_size(self, mknode):  # pylint: disable=no-self-use
         node = NodeHeap(mknode(intid=0), 3)
-        self.assertEqual(0, len(node))
+        assert not node
 
         for digit in range(10):
             node.push(mknode(intid=digit))
-        self.assertEqual(3, len(node))
 
-        self.assertEqual(3, len(list(node)))
+        assert len(node) == 3
+        assert len(list(node)) == 3
 
-    def test_iteration(self):
+    def test_iteration(self, mknode):  # pylint: disable=no-self-use
         heap = NodeHeap(mknode(intid=0), 5)
         nodes = [mknode(intid=x) for x in range(10)]
         for index, node in enumerate(nodes):
             heap.push(node)
         for index, node in enumerate(heap):
-            self.assertEqual(index, node.long_id)
-            self.assertTrue(index < 5)
+            assert index == node.long_id
+            assert index < 5
 
-    def test_remove(self):
+    def test_remove(self, mknode):  # pylint: disable=no-self-use
         heap = NodeHeap(mknode(intid=0), 5)
         nodes = [mknode(intid=x) for x in range(10)]
         for node in nodes:
             heap.push(node)
 
         heap.remove([nodes[0].id, nodes[1].id])
-        self.assertEqual(len(list(heap)), 5)
+        assert len(list(heap)) == 5
         for index, node in enumerate(heap):
-            self.assertEqual(index + 2, node.long_id)
-            self.assertTrue(index < 5)
+            assert index + 2 == node.long_id
+            assert index < 5
diff --git a/kademlia/tests/test_routing.py b/kademlia/tests/test_routing.py
index 4cf84eb..266b712 100644
--- a/kademlia/tests/test_routing.py
+++ b/kademlia/tests/test_routing.py
@@ -1,28 +1,25 @@
-import unittest
-
 from random import shuffle
 from kademlia.routing import KBucket, TableTraverser
-from kademlia.tests.utils import mknode, FakeProtocol
 
 
-class KBucketTest(unittest.TestCase):
-    def test_split(self):
+class TestKBucket:
+    def test_split(self, mknode):  # pylint: disable=no-self-use
         bucket = KBucket(0, 10, 5)
         bucket.add_node(mknode(intid=5))
         bucket.add_node(mknode(intid=6))
         one, two = bucket.split()
-        self.assertEqual(len(one), 1)
-        self.assertEqual(one.range, (0, 5))
-        self.assertEqual(len(two), 1)
-        self.assertEqual(two.range, (6, 10))
+        assert len(one) == 1
+        assert one.range == (0, 5)
+        assert len(two) == 1
+        assert two.range == (6, 10)
 
-    def test_add_node(self):
+    def test_add_node(self, mknode):  # pylint: disable=no-self-use
         # when full, return false
         bucket = KBucket(0, 10, 2)
-        self.assertTrue(bucket.add_node(mknode()))
-        self.assertTrue(bucket.add_node(mknode()))
-        self.assertFalse(bucket.add_node(mknode()))
-        self.assertEqual(len(bucket), 2)
+        assert bucket.add_node(mknode()) is True
+        assert bucket.add_node(mknode()) is True
+        assert bucket.add_node(mknode()) is False
+        assert len(bucket) == 2
 
         # make sure when a node is double added it's put at the end
         bucket = KBucket(0, 10, 3)
@@ -30,9 +27,9 @@ class KBucketTest(unittest.TestCase):
         for node in nodes:
             bucket.add_node(node)
         for index, node in enumerate(bucket.get_nodes()):
-            self.assertEqual(node, nodes[index])
+            assert node == nodes[index]
 
-    def test_remove_node(self):
+    def test_remove_node(self, mknode):  # pylint: disable=no-self-use
         k = 3
         bucket = KBucket(0, 10, k)
         nodes = [mknode() for _ in range(10)]
@@ -40,50 +37,44 @@ class KBucketTest(unittest.TestCase):
             bucket.add_node(node)
 
         replacement_nodes = bucket.replacement_nodes
-        self.assertEqual(list(bucket.nodes.values()), nodes[:k])
-        self.assertEqual(list(replacement_nodes.values()), nodes[k:])
+        assert list(bucket.nodes.values()) == nodes[:k]
+        assert list(replacement_nodes.values()) == nodes[k:]
 
         bucket.remove_node(nodes.pop())
-        self.assertEqual(list(bucket.nodes.values()), nodes[:k])
-        self.assertEqual(list(replacement_nodes.values()), nodes[k:])
+        assert list(bucket.nodes.values()) == nodes[:k]
+        assert list(replacement_nodes.values()) == nodes[k:]
 
         bucket.remove_node(nodes.pop(0))
-        self.assertEqual(list(bucket.nodes.values()), nodes[:k-1] + nodes[-1:])
-        self.assertEqual(list(replacement_nodes.values()), nodes[k-1:-1])
+        assert list(bucket.nodes.values()) == nodes[:k-1] + nodes[-1:]
+        assert list(replacement_nodes.values()) == nodes[k-1:-1]
 
         shuffle(nodes)
         for node in nodes:
             bucket.remove_node(node)
-        self.assertEqual(len(bucket), 0)
-        self.assertEqual(len(replacement_nodes), 0)
+        assert not bucket
+        assert not replacement_nodes
 
-    def test_in_range(self):
+    def test_in_range(self, mknode):  # pylint: disable=no-self-use
         bucket = KBucket(0, 10, 10)
-        self.assertTrue(bucket.has_in_range(mknode(intid=5)))
-        self.assertFalse(bucket.has_in_range(mknode(intid=11)))
-        self.assertTrue(bucket.has_in_range(mknode(intid=10)))
-        self.assertTrue(bucket.has_in_range(mknode(intid=0)))
+        assert bucket.has_in_range(mknode(intid=5)) is True
+        assert bucket.has_in_range(mknode(intid=11)) is False
+        assert bucket.has_in_range(mknode(intid=10)) is True
+        assert bucket.has_in_range(mknode(intid=0)) is True
 
 
-class RoutingTableTest(unittest.TestCase):
-    def setUp(self):
-        self.id = mknode().id  # pylint: disable=invalid-name
-        self.protocol = FakeProtocol(self.id)
-        self.router = self.protocol.router
-
-    def test_add_contact(self):
-        self.router.add_contact(mknode())
-        self.assertTrue(len(self.router.buckets), 1)
-        self.assertTrue(len(self.router.buckets[0].nodes), 1)
+# pylint: disable=too-few-public-methods
+class TestRoutingTable:
+    # pylint: disable=no-self-use
+    def test_add_contact(self, fake_server, mknode):
+        fake_server.router.add_contact(mknode())
+        assert len(fake_server.router.buckets) == 1
+        assert len(fake_server.router.buckets[0].nodes) == 1
 
 
-class TableTraverserTest(unittest.TestCase):
-    def setUp(self):
-        self.id = mknode().id  # pylint: disable=invalid-name
-        self.protocol = FakeProtocol(self.id)
-        self.router = self.protocol.router
-
-    def test_iteration(self):
+# pylint: disable=too-few-public-methods
+class TestTableTraverser:
+    # pylint: disable=no-self-use
+    def test_iteration(self, fake_server, mknode):
         """
         Make 10 nodes, 5 buckets, two nodes add to one bucket in order,
         All buckets: [node0, node1], [node2, node3], [node4, node5],
@@ -101,12 +92,13 @@ class TableTraverserTest(unittest.TestCase):
             buckets.append(bucket)
 
         # replace router's bucket with our test buckets
-        self.router.buckets = buckets
+        fake_server.router.buckets = buckets
 
         # expected nodes order
         expected_nodes = [nodes[5], nodes[4], nodes[3], nodes[2], nodes[7],
                           nodes[6], nodes[1], nodes[0], nodes[9], nodes[8]]
 
         start_node = nodes[4]
-        for index, node in enumerate(TableTraverser(self.router, start_node)):
-            self.assertEqual(node, expected_nodes[index])
+        table_traverser = TableTraverser(fake_server.router, start_node)
+        for index, node in enumerate(table_traverser):
+            assert node == expected_nodes[index]
diff --git a/kademlia/tests/test_server.py b/kademlia/tests/test_server.py
index 43df098..81fcc33 100644
--- a/kademlia/tests/test_server.py
+++ b/kademlia/tests/test_server.py
@@ -1,4 +1,3 @@
-import unittest
 import asyncio
 
 import pytest
@@ -20,9 +19,9 @@ async def test_storing(bootstrap_node):
     server.stop()
 
 
-class SwappableProtocolTests(unittest.TestCase):
+class TestSwappableProtocol:
 
-    def test_default_protocol(self):
+    def test_default_protocol(self):  # pylint: disable=no-self-use
         """
         An ordinary Server object will initially not have a protocol, but will
         have a KademliaProtocol object as its protocol after its listen()
@@ -30,12 +29,12 @@ class SwappableProtocolTests(unittest.TestCase):
         """
         loop = asyncio.get_event_loop()
         server = Server()
-        self.assertIsNone(server.protocol)
+        assert server.protocol is None
         loop.run_until_complete(server.listen(8469))
-        self.assertIsInstance(server.protocol, KademliaProtocol)
+        assert isinstance(server.protocol, KademliaProtocol)
         server.stop()
 
-    def test_custom_protocol(self):
+    def test_custom_protocol(self):  # pylint: disable=no-self-use
         """
         A subclass of Server which overrides the protocol_class attribute will
         have an instance of that class as its protocol after its listen()
@@ -53,11 +52,11 @@ class SwappableProtocolTests(unittest.TestCase):
         loop = asyncio.get_event_loop()
         server = Server()
         loop.run_until_complete(server.listen(8469))
-        self.assertNotIsInstance(server.protocol, CoconutProtocol)
+        assert not isinstance(server.protocol, CoconutProtocol)
         server.stop()
 
         # ...but our custom server does.
         husk_server = HuskServer()
         loop.run_until_complete(husk_server.listen(8469))
-        self.assertIsInstance(husk_server.protocol, CoconutProtocol)
+        assert isinstance(husk_server.protocol, CoconutProtocol)
         husk_server.stop()
diff --git a/kademlia/tests/test_storage.py b/kademlia/tests/test_storage.py
index aa7a275..58e52de 100644
--- a/kademlia/tests/test_storage.py
+++ b/kademlia/tests/test_storage.py
@@ -1,29 +1,27 @@
-import unittest
-
 from kademlia.storage import ForgetfulStorage
 
 
-class ForgetfulStorageTest(unittest.TestCase):
-    def test_storing(self):
+class ForgetfulStorageTest:
+    def test_storing(self):  # pylint: disable=no-self-use
         storage = ForgetfulStorage(10)
         storage['one'] = 'two'
-        self.assertEqual(storage['one'], 'two')
+        assert storage['one'] == 'two'
 
-    def test_forgetting(self):
+    def test_forgetting(self):  # pylint: disable=no-self-use
         storage = ForgetfulStorage(0)
         storage['one'] = 'two'
-        self.assertEqual(storage.get('one'), None)
+        assert storage.get('one') is None
 
-    def test_iter(self):
+    def test_iter(self):  # pylint: disable=no-self-use
         storage = ForgetfulStorage(10)
         storage['one'] = 'two'
         for key, value in storage:
-            self.assertEqual(key, 'one')
-            self.assertEqual(value, 'two')
+            assert key == 'one'
+            assert value == 'two'
 
-    def test_iter_old(self):
+    def test_iter_old(self):  # pylint: disable=no-self-use
         storage = ForgetfulStorage(10)
         storage['one'] = 'two'
         for key, value in storage.iter_older_than(0):
-            self.assertEqual(key, 'one')
-            self.assertEqual(value, 'two')
+            assert key == 'one'
+            assert value == 'two'
diff --git a/kademlia/tests/test_utils.py b/kademlia/tests/test_utils.py
index 9fcdd86..afccaa9 100644
--- a/kademlia/tests/test_utils.py
+++ b/kademlia/tests/test_utils.py
@@ -1,26 +1,25 @@
 import hashlib
-import unittest
 
 from kademlia.utils import digest, shared_prefix
 
 
-class UtilsTest(unittest.TestCase):
-    def test_digest(self):
+class TestUtils:
+    def test_digest(self):  # pylint: disable=no-self-use
         dig = hashlib.sha1(b'1').digest()
-        self.assertEqual(dig, digest(1))
+        assert dig == digest(1)
 
         dig = hashlib.sha1(b'another').digest()
-        self.assertEqual(dig, digest('another'))
+        assert dig == digest('another')
 
-    def test_shared_prefix(self):
+    def test_shared_prefix(self):   # pylint: disable=no-self-use
         args = ['prefix', 'prefixasdf', 'prefix', 'prefixxxx']
-        self.assertEqual(shared_prefix(args), 'prefix')
+        assert shared_prefix(args) == 'prefix'
 
         args = ['p', 'prefixasdf', 'prefix', 'prefixxxx']
-        self.assertEqual(shared_prefix(args), 'p')
+        assert shared_prefix(args) == 'p'
 
         args = ['one', 'two']
-        self.assertEqual(shared_prefix(args), '')
+        assert shared_prefix(args) == ''
 
         args = ['hi']
-        self.assertEqual(shared_prefix(args), 'hi')
+        assert shared_prefix(args) == 'hi'
diff --git a/kademlia/tests/utils.py b/kademlia/tests/utils.py
deleted file mode 100644
index fa4703a..0000000
--- a/kademlia/tests/utils.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-Utility functions for tests.
-"""
-import random
-import hashlib
-from struct import pack
-
-from kademlia.node import Node
-from kademlia.routing import RoutingTable
-
-
-def mknode(node_id=None, ip_addy=None, port=None, intid=None):
-    """
-    Make a node.  Created a random id if not specified.
-    """
-    if intid is not None:
-        node_id = pack('>l', intid)
-    if not node_id:
-        randbits = str(random.getrandbits(255))
-        node_id = hashlib.sha1(randbits.encode()).digest()
-    return Node(node_id, ip_addy, port)
-
-
-class FakeProtocol:  # pylint: disable=too-few-public-methods
-    def __init__(self, source_id, ksize=20):
-        self.router = RoutingTable(self, ksize, Node(source_id))
-        self.storage = {}
-        self.source_id = source_id
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..8dd3b97
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = -vv --cov-report term-missing --cov kademlia