diff --git a/nipap-www/debian/rules b/nipap-www/debian/rules
index 613576055..641186e52 100755
--- a/nipap-www/debian/rules
+++ b/nipap-www/debian/rules
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python3 --buildsystem=python_distutils
-
-
+	dh $@ --with python3 --buildsystem=pybuild
diff --git a/nipap-www/setup.py b/nipap-www/setup.py
index daba02df5..6f1591e30 100644
--- a/nipap-www/setup.py
+++ b/nipap-www/setup.py
@@ -17,7 +17,6 @@
     license=nipapwww.__license__,
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
-    test_suite='nose.collector',
     package_data={'nipapwww': ['i18n/*/LC_MESSAGES/*.mo']},
     data_files=[
         ('/etc/nipap/www', ['nipap-www.wsgi', ]),
diff --git a/nipap/debian/rules b/nipap/debian/rules
index fbb18bf44..05bb2c5d0 100755
--- a/nipap/debian/rules
+++ b/nipap/debian/rules
@@ -4,6 +4,4 @@
 # Tue, 18 Oct 2011 21:55:07 +0200
 
 %:
-	dh $@ --with python3 --buildsystem=python_distutils
-
-
+	dh $@ --with python3 --buildsystem=pybuild
diff --git a/whoisd/debian/rules b/whoisd/debian/rules
index e843f49b5..ad769322e 100755
--- a/whoisd/debian/rules
+++ b/whoisd/debian/rules
@@ -4,6 +4,4 @@
 # Wed, 29 Feb 2012 09:03:22 +0100
 
 %:
-	dh $@ --with python3 --buildsystem=python_distutils
-
-
+	dh $@ --with python3 --buildsystem=pybuild