diff --git a/Makefile b/Makefile
index 947ccd9d06e3cd2100ec98981cbff2a5358b6978..2546071e5e3e2154f1b73129a5e4b9913b856024 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean test all
+.PHONY: clean all
 
 all: unshare/constants.py
 
@@ -10,8 +10,4 @@ unshare/constants.py:
 		awk '/#define MS_|#define CLONE_/ {print $$2, "=", $$3}' > unshare/constants.py
 
 clean:
-	rm -rf unshare/constants.py *.pyc __pycache__ unshare/*.pyc unshare/__pycache__
-
-test: clean all
-	python test.py
-	python3 test.py
+	rm -rf unshare/constants.py
diff --git a/setup.py b/setup.py
index 6bcfff56d338ebcea54a78d3c562f2904de52b0a..bdec6dae012efa6246e7dd6f9d39092b274412cc 100644
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,8 @@ setup(
     classifiers=[
         'Development status :: 3 - Alpha',
         'Intended Audience :: Developers',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 2',
         'Intended Audience :: System Administrators',
         'Topic :: Utilities',
     ],
@@ -22,6 +22,5 @@ setup(
     packages=find_packages(exclude=['tests']),
     install_requires=[],
     extras_require={
-        'dev': ['tox'],
-        'test': ['flake8', 'check-manifest', 'coverage', 'pytest']},
+        'dev': ['tox']},
 )
diff --git a/tests/test_basic_assertions.py b/tests/basic_assertions_test.py
similarity index 100%
rename from tests/test_basic_assertions.py
rename to tests/basic_assertions_test.py
diff --git a/tox.ini b/tox.ini
index 06479f01a9bffa2cf31cc61201b5013e1f076b21..bcfe2328ea56df8f7b181364d9798ee1f7ba52f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,19 +3,19 @@ ignore=F403
 exclude = .tox,*.egg,build,data,unshare/constants.py
 
 [tox]
-envlist = py{27,35}
+envlist = py{2,3}
 
 [testenv]
 basepython =
-    py27: python2.7
-    py35: python3.5
+    py2: python2
+    py3: python3
 deps =
     check-manifest
-    {py27,py35}: readme_renderer
+    readme_renderer
     flake8
+    pytest
 commands =
     check-manifest --ignore tox.ini,tests*
-    # py26 doesn't have "setup.py check"
-    {py27,py35}: python setup.py check -m -r -s
+    python setup.py check -m -r -s
     flake8 .
-    py.test tests
+    py.test