diff --git a/tests/Makefile.am b/tests/Makefile.am
index 85dd0a5b..3e80f9ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,6 +32,7 @@ CONFS=fastcgi-10.conf \
       mod-fastcgi.t \
       mod-redirect.t \
       mod-userdir.t \
+      mod-rewrite.t \
       request.t 
 
 
diff --git a/tests/docroot/www/indexfile/Makefile.am b/tests/docroot/www/indexfile/Makefile.am
index 2487a42b..04727308 100644
--- a/tests/docroot/www/indexfile/Makefile.am
+++ b/tests/docroot/www/indexfile/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST=index.php return-404.php
+EXTRA_DIST=index.php return-404.php rewrite.php
diff --git a/tests/docroot/www/indexfile/rewrite.php b/tests/docroot/www/indexfile/rewrite.php
new file mode 100644
index 00000000..fb412907
--- /dev/null
+++ b/tests/docroot/www/indexfile/rewrite.php
@@ -0,0 +1,3 @@
+<?php
+	print $_SERVER["QUERY_STRING"];
+?>
diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf
index 2545e570..1cbdab56 100644
--- a/tests/lighttpd.conf
+++ b/tests/lighttpd.conf
@@ -125,6 +125,9 @@ url.access-deny             = ( "~", ".inc")
 
 url.redirect                = ( "^/redirect/$" => "http://localhost:2048/" )
 
+url.rewrite		    = ( "^/rewrite/foo($|\?.+)" => "/indexfile/rewrite.php$1",
+				"^/rewrite/bar(?:$|\?(.+))" => "/indexfile/rewrite.php?bar&$1" )
+
 expire.url                  = ( "/expire/access" => "access 2 hours", 
 				"/expire/modification" => "access plus 1 seconds 2 minutes")