diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ef2351d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+notifications:
+  email: false
+language: python
+python:
+  - "2.7"
+install:
+  - "sudo apt-get install lzop"
+cache: apt
+script: python setup.py test
diff --git a/README.md b/README.md
index 16ce7cf..74b01bc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 python-lzo-indexer
 ==================
 
-Python library for indexing block offsets within LZO compressed files
+![](https://travis-ci.org/duedil-ltd/python-lzo-indexer.png)
+
+Python library for indexing block offsets within LZO compressed files.
diff --git a/setup.py b/setup.py
index a3365ed..375558c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,22 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 
 def read(filename):
     return open(filename).read()
 
 setup(name="lzo-indexer",
-      version="0.0.1",
-      description="Library for indexing LZO compressed files",
-      long_description=read("README.md"),
-      author="Tom Arnfeld",
-      author_email="tom@duedil.com",
-      maintainer="Tom Arnfeld",
-      maintainer_email="tom@duedil.com",
-      url="https://github.com/duedil-ltd/python-lzo-indexer",
-      download_url="https://github.com/duedil-ltd/python-lzo-indexer/archive/release-0.0.1.zip",
-      license=read("LICENSE"),
-      packages=['lzo_indexer'],
-      )
+    version="0.0.1",
+    description="Library for indexing LZO compressed files",
+    long_description=read("README.md"),
+    author="Tom Arnfeld",
+    author_email="tom@duedil.com",
+    maintainer="Tom Arnfeld",
+    maintainer_email="tom@duedil.com",
+    url="https://github.com/duedil-ltd/python-lzo-indexer",
+    download_url="https://github.com/duedil-ltd/python-lzo-indexer/archive/release-0.0.1.zip",
+    license=read("LICENSE"),
+    packages=["lzo_indexer"],
+    test_suite="tests.test_indexer",
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_indexer.py b/tests/test_indexer.py
new file mode 100644
index 0000000..3ed6b46
--- /dev/null
+++ b/tests/test_indexer.py
@@ -0,0 +1,72 @@
+import unittest
+import lzo_indexer
+from StringIO import StringIO
+from subprocess import Popen, PIPE, STDOUT
+
+
+class TestLZOIndexer(unittest.TestCase):
+
+    def test_get_blocks_single_block(self):
+        stream = self._lzo_stream(1)
+        index = lzo_indexer.get_lzo_blocks(stream)
+
+        block = index.next()
+        self.assertEqual(block, 38)
+        with self.assertRaises(StopIteration):
+            index.next()
+
+    def test_get_blocks_multiple_blocks(self):
+        stream = self._lzo_stream(10**6)
+        index = lzo_indexer.get_lzo_blocks(stream)
+
+        expected_offsets = [38, 1233, 2428, 3623]
+        self.assertEqual(list(index), expected_offsets)
+
+    def test_index_lzo_string_single_block(self):
+        string = self._lzo_stream(1).getvalue()
+        index = lzo_indexer.index_lzo_string(string)
+
+        self.assertEqual(index, "\x00\x00\x00\x00\x00\x00\x00\x26")
+
+    def test_index_lzo_string_multiple_blocks(self):
+        string = self._lzo_stream(10**6).getvalue()
+        index = lzo_indexer.index_lzo_string(string)
+
+        self.assertEqual(index, "\x00\x00\x00\x00\x00\x00\x00&\x00\x00\x00" \
+                                "\x00\x00\x00\x04\xd1\x00\x00\x00\x00\x00" \
+                                "\x00\t|\x00\x00\x00\x00\x00\x00\x0e'")
+
+    def test_index_lzo_file_single_block(self):
+        stream = self._lzo_stream(1)
+        index = StringIO()
+
+        lzo_indexer.index_lzo_file(stream, index)
+
+        self.assertEqual(index.getvalue(), "\x00\x00\x00\x00\x00\x00\x00\x26")
+
+    def test_index_lzo_file_multiple_blocks(self):
+        stream = self._lzo_stream(10**6)
+        index = StringIO()
+
+        lzo_indexer.index_lzo_file(stream, index)
+
+        self.assertEqual(index.getvalue(), "\x00\x00\x00\x00\x00\x00\x00&\x00" \
+                                           "\x00\x00\x00\x00\x00\x04\xd1\x00" \
+                                           "\x00\x00\x00\x00\x00\t|\x00\x00" \
+                                           "\x00\x00\x00\x00\x0e'")
+
+    def _lzo_stream(self, length=4096):
+        """Compress a string of null bytes, the length being defined by the
+        argument to this function.
+        """
+
+        compressor = Popen(["lzop", "-c"], stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        stdout, stderr = compressor.communicate(input="\x00" * length)
+
+        if stderr:
+            raise Exception("Failed to compress with error %r" % (stderr))
+
+        stream = StringIO(stdout)
+        stream.seek(0)
+
+        return stream