diff --git a/tests/Makefile.am b/tests/Makefile.am
index cf9aa9aa..57d3ea53 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,8 @@ CONFS=\
 	mod-cgi.t \
 	mod-compress.conf \
 	mod-compress.t \
+	mod-evhost.conf \
+	mod-evhost.t \
 	mod-extforward.conf \
 	mod-extforward.t \
 	mod-fastcgi.t \
diff --git a/tests/mod-evhost.conf b/tests/mod-evhost.conf
new file mode 100644
index 00000000..a7a7b079
--- /dev/null
+++ b/tests/mod-evhost.conf
@@ -0,0 +1,47 @@
+server.document-root         = env.SRCDIR + "/tmp/lighttpd/servers/evhost"
+server.pid-file              = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
+
+## bind to port (default: 80)
+server.port                 = 2048
+
+## bind to localhost (default: all interfaces)
+server.bind                = "localhost"
+server.name                = "www.example.org"
+server.tag                 = "Proxy"
+server.errorlog            = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
+server.breakagelog         = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.log"
+accesslog.filename         = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
+
+server.modules              = (
+				"mod_evhost",
+				"mod_accesslog" )
+
+server.indexfiles           = ( "index.html" )
+
+
+######################## MODULE CONFIG ############################
+
+
+#### mod-evhost
+$HTTP["host"] =~ "evhost1.example.org" {
+  evhost.path-pattern = env.SRCDIR + "/tmp/lighttpd/servers/evhost/%{3.1}/%{3.2}/%3/pages/"
+}
+
+else $HTTP["host"] =~ "evhost2.example.org" {
+  evhost.path-pattern = env.SRCDIR + "/tmp/lighttpd/servers/evhost/%3/pages/"
+}
+
+else $HTTP["host"] =~ "evhost3.example.org" {
+  evhost.path-pattern = env.SRCDIR + "/tmp/lighttpd/servers/evhost/%{3.0}/pages/"
+}
+
+else $HTTP["host"] =~ "evhost4.example.org" {
+  evhost.path-pattern = env.SRCDIR + "/tmp/lighttpd/servers/evhost/%3.\1/pages/"
+}
+
+else $HTTP["host"] =~ "evhost5.example.org" {
+  evhost.path-pattern = env.SRCDIR + "/tmp/lighttpd/servers/evhost/%3.\1/pages/"
+}
+else $HTTP["host"] =~ "evhost.example.org" {
+  url.access-deny = ("")
+}
diff --git a/tests/mod-evhost.t b/tests/mod-evhost.t
new file mode 100644
index 00000000..4deea805
--- /dev/null
+++ b/tests/mod-evhost.t
@@ -0,0 +1,63 @@
+#!/usr/bin/env perl
+BEGIN {
+    # add current source dir to the include-path
+    # we need this for make distcheck
+   (my $srcdir = $0) =~ s#/[^/]+$#/#;
+   unshift @INC, $srcdir;
+}
+
+use strict;
+use IO::Socket;
+use Test::More tests => 7;
+use LightyTest;
+
+my $tf = LightyTest->new();
+$tf->{CONFIGFILE} = 'mod-evhost.conf';
+my $t;
+
+ok($tf->start_proc == 0, "Starting lighttpd") or die();
+
+# test for correct config
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+Host: evhost1.example.org
+EOF
+ );
+ok($tf->handle_http($t) == 0, 'correct pattern using dot notation');
+
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+Host: evhost2.example.org
+EOF
+ );
+ok($tf->handle_http($t) == 0, 'correct pattern not using dot notation');
+
+# test for broken config
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404 } ];
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+Host: evhost3.example.org
+EOF
+ );
+ok($tf->handle_http($t) == 0, 'broken pattern 1');
+
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404 } ];
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+Host: evhost4.example.org
+EOF
+ );
+ok($tf->handle_http($t) == 0, 'broken pattern 2');
+
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404 } ];
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+Host: evhost5.example.org
+EOF
+ );
+ok($tf->handle_http($t) == 0, 'broken pattern 3');
+
+ok($tf->stop_proc == 0, "Stopping lighttpd");
+
diff --git a/tests/prepare.sh b/tests/prepare.sh
index 2a0f2537..306d1ce6 100755
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
@@ -23,6 +23,8 @@ mkdir -p "${tmpdir}/servers/www.example.org/pages/indexfile/"
 mkdir -p "${tmpdir}/servers/123.example.org/pages/"
 mkdir -p "${tmpdir}/servers/a.example.org/pages/a/"
 mkdir -p "${tmpdir}/servers/b.example.org/pages/b/"
+mkdir -p "${tmpdir}/servers/evhost/e/v/evhost1/pages"
+mkdir -p "${tmpdir}/servers/evhost/evhost2/pages"
 mkdir -p "${tmpdir}/logs/"
 mkdir -p "${tmpdir}/cache/"
 mkdir -p "${tmpdir}/cache/compress/"
@@ -52,7 +54,9 @@ touch "${tmpdir}/servers/www.example.org/pages/image.jpg" \
       "${tmpdir}/servers/www.example.org/pages/a" \
       "${tmpdir}/servers/www.example.org/pages/index.html~" \
       "${tmpdir}/servers/a.example.org/pages/a/a.html" \
-      "${tmpdir}/servers/b.example.org/pages/b/b.html"
+      "${tmpdir}/servers/b.example.org/pages/b/b.html" \
+      "${tmpdir}/servers/evhost/e/v/evhost1/pages/index.html" \
+      "${tmpdir}/servers/evhost/evhost2/pages/index.html"
 echo "12345" > "${tmpdir}/servers/www.example.org/pages/range.pdf"
 
 printf "%-40s" "preparing infrastructure"