diff --git a/dev-python/lz4/files/test.py b/dev-python/lz4/files/test.py
new file mode 100644
index 0000000000000..9469a03da328f
--- /dev/null
+++ b/dev-python/lz4/files/test.py
@@ -0,0 +1,16 @@
+import lz4
+import sys
+
+
+import unittest
+import os
+
+class TestLZ4(unittest.TestCase):
+
+    def test_random(self):
+      DATA = os.urandom(128 * 1024)  # Read 128kb
+      self.assertEqual(DATA, lz4.loads(lz4.dumps(DATA)))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
index ed344fb1c6069..b75564adfb8ee 100644
--- a/dev-python/lz4/lz4-0.8.2.ebuild
+++ b/dev-python/lz4/lz4-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
@@ -14,15 +14,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
 
 RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Tests still excluded by upstream
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
 
 python_prepare_all() {
 	sed \
 		-e '/nose/s:setup_requires:test_requires:g' \
 		-i setup.py || die
+	mkdir "${S}"/tests
+	cp "${FILESDIR}"/test.py "${S}"/tests
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	esetup.py test || dies "Tests failed with ${EPYTHON}"
+}