diff --git a/docs/usage.rst b/docs/usage.rst
index 757c02e..04ae353 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -138,7 +138,7 @@ those coming from 10X experiments, barcodes sometimes end up at a specific
 location in each read. It can also be that the barcode is in the header, but
 only part of this barcode is used, this happens when dual indexing is used for
 example. To deal with these cases, both the ``guess`` as well as the ``demux``
-subcommand can be instructed to look voor the barcode in the read with the
+subcommand can be instructed to look for the barcode in the read with the
 ``-r`` option and a selection can be made by providing a start- and end
 coordinate via the ``-s`` and ``-e`` options. For example, if we want to search
 for barcodes in the first six nucleotides of a read, we use the following
diff --git a/tests/test_demultiplex.py b/tests/test_demultiplex.py
index 7d82316..a04be7a 100644
--- a/tests/test_demultiplex.py
+++ b/tests/test_demultiplex.py
@@ -10,7 +10,7 @@
 
 
 class TestCLI(object):
-    def setup(self):
+    def setup_method(self):
         fake_open = FakeOpen()
         self._handles = fake_open.handles
         dmp = import_module('demultiplex.demultiplex')