diff --git a/Makefile b/Makefile
index 45392d7d5c93c3a428a428673b4d19821326b3bc..806b177fbb325934febcfb98a4b0ac9601f71752 100644
--- a/Makefile
+++ b/Makefile
@@ -29,15 +29,6 @@ install: install-dev install-runtime
 dist_fallback:
 	make -C pydist $@
 
-nose:
-	nosetests --with-doctest --with-coverage
-
-tests: nose
-	make -C tests
-
-test%:
-	make -C tests $@
-
 check_versions:
 	@PYTHONPATH=. set -e; \
 	DEFAULT=`python -c 'import debpython.version as v; print v.vrepr(v.DEFAULT)'`;\
@@ -49,4 +40,17 @@ check_versions:
 	[ "$$SUPPORTED" = "$$DEB_SUPPORTED" ] || \
 	(echo 'Please update SUPPORTED in debpython/version.py' >/dev/stderr; false)
 
+# TESTS
+nose:
+	nosetests --with-doctest --with-coverage
+
+unittests:
+	python2.7 -m unittest discover -v
+
+tests: nose
+	make -C tests
+
+test%:
+	make -C tests $@
+
 .PHONY: clean tests test% check_versions
diff --git a/debpython/version.py b/debpython/version.py
index c7eda6d1db801e376f2c1ef894bb71ac4a61dbd1..cf032f99f5c2348962cfef34491b2bb8978b242d 100644
--- a/debpython/version.py
+++ b/debpython/version.py
@@ -38,7 +38,7 @@ def get_requested_versions(vrange=None, available=None):
     :type available: bool
 
     >>> sorted(get_requested_versions([(2, 5), (3, 0)]))
-    [(2, 5), (2, 6)]
+    [(2, 5), (2, 6), (2, 7)]
     >>> sorted(get_requested_versions('')) == sorted(SUPPORTED)
     True
     >>> sorted(get_requested_versions([None, None])) == sorted(SUPPORTED)
diff --git a/tests/Makefile b/tests/Makefile
index 3417ac778c03cfa92681129b6c5069c2b2101fdf..9d938246be68625a7e955222e754ceaaa0556f31 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,13 +1,19 @@
 #!/usr/bin/make -f
 
-all: test1
+# enable or disable tests here:
+TESTS := test1
+
+all: $(TESTS)
 
 test%:
-	(cd t$*; debuild -us -uc)
+	make -C t$* run
+	make -C t$* check
+
+clean-test%:
+	make -C t$* clean
 
-clean:
+clean: $(TESTS:%=clean-%)
 	rm -f *\.dsc *\.tar\.gz *\.build *\.changes *\.deb
-	(cd t1; ./debian/rules clean)
-	@find . -name '*\.egg-info' -exec rm -rf "{}" \; || true
+	@find . -prune -name '*.egg-info' -exec rm -rf '{}' ';' || true
 
 .PHONY: clean
diff --git a/tests/t1/Makefile b/tests/t1/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..8f4b6609130e8726d8002d4541235fd66867b6f0
--- /dev/null
+++ b/tests/t1/Makefile
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+all: run check
+
+
+run: clean
+	dpkg-buildpackage -b -us -uc
+
+check:
+	grep -q "Depends: .*python-mako" debian/python-foo/DEBIAN/control
+	test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/__init__.py
+	test ! -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/spam.py
+
+clean:
+	./debian/rules clean
+	rm -rf lib/Foo.egg-info
diff --git a/tests/t1/debian/rules b/tests/t1/debian/rules
index ce6efd19905c03352f24638f9d323089b9e6e52f..c8aea4a4cc3957aa06a19eeb58546d84a50c7de3 100755
--- a/tests/t1/debian/rules
+++ b/tests/t1/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --buildsystem=python_distutils
 
 override_dh_pysupport:
 	find debian/ -name jquery.js -exec \