diff --git a/debian/changelog b/debian/changelog
index 658b7669..b0a276e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ midori (0.1.6-2) UNRELEASED; urgency=low
   * adopt package: set myself as maintainer, remove uploaders, remove dm
     flag (Closes: #528731)
   * rearrange the debian/rules file
+  * use xvfb for tests
+  * use 'dh --with quilt' for patching instead of including
+    /usr/share/quilt/quilt.make
 
- -- Ryan Niebur <ryanryan52@gmail.com>  Thu, 14 May 2009 22:14:14 -0700
+ -- Ryan Niebur <ryanryan52@gmail.com>  Thu, 14 May 2009 22:24:31 -0700
 
 midori (0.1.6-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index bc0611b6..2159a52b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ryan Niebur <ryanryan52@gmail.com>
 Build-Depends:
  debhelper (>= 7.2),
- quilt,
+ quilt (>= 0.46-7),
  libgtk2.0-dev (>= 2.10),
  libglib2.0-dev,
  libwebkit-dev (>= 1.1),
@@ -19,6 +19,10 @@ Build-Depends:
  libunique-dev (>= 1.0.6),
  python-docutils,
  libsoup2.4-dev (>= 2.25.2),
+# For testing under xvfb:
+ xvfb,
+ xauth,
+ xfonts-base
 # Disabled optional dependencies:
 Build-Conflicts:
  gtk-doc-tools,
diff --git a/debian/rules b/debian/rules
index 6b4388e3..c5639801 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 %:
-	dh $@
-
-clean: unpatch
-
-build binary-arch: patch
+	dh --with quilt $@
 
 override_dh_auto_clean:
 	./waf --nocache distclean
@@ -20,7 +14,7 @@ override_dh_auto_build:
 	./waf --nocache build --debug full
 
 override_dh_auto_test:
-	./waf --nocache check
+	xvfb-run ./waf --nocache check
 
 override_dh_auto_install:
 	./waf --nocache install --destdir debian/tmp