diff --git a/lib/HTTP/ConditionalGet/test/2.php b/web/test/HTTP_ConditionalGet/2.php
similarity index 92%
rename from lib/HTTP/ConditionalGet/test/2.php
rename to web/test/HTTP_ConditionalGet/2.php
index 1bbd1f9..df7b650 100644
--- a/lib/HTTP/ConditionalGet/test/2.php
+++ b/web/test/HTTP_ConditionalGet/2.php
@@ -1,6 +1,7 @@
 <?php
 
-require '../../ConditionalGet.php';
+require '../../config.php';
+require 'HTTP/ConditionalGet.php';
 
 // emulate regularly updating document
 $every = 20;
diff --git a/lib/HTTP/ConditionalGet/test/3.php b/web/test/HTTP_ConditionalGet/3.php
similarity index 94%
rename from lib/HTTP/ConditionalGet/test/3.php
rename to web/test/HTTP_ConditionalGet/3.php
index 596c35a..1d14aa4 100644
--- a/lib/HTTP/ConditionalGet/test/3.php
+++ b/web/test/HTTP_ConditionalGet/3.php
@@ -1,5 +1,7 @@
 <?php
-require '../../ConditionalGet.php';
+
+require '../../config.php';
+require 'HTTP/ConditionalGet.php';
 
 // generate content first (not ideal)
 // emulate regularly updating document
diff --git a/lib/HTTP/ConditionalGet/test/4.php b/web/test/HTTP_ConditionalGet/4.php
similarity index 94%
rename from lib/HTTP/ConditionalGet/test/4.php
rename to web/test/HTTP_ConditionalGet/4.php
index 7201f01..6120e9a 100644
--- a/lib/HTTP/ConditionalGet/test/4.php
+++ b/web/test/HTTP_ConditionalGet/4.php
@@ -1,5 +1,7 @@
 <?php
-require '../../ConditionalGet.php';
+
+require '../../config.php';
+require 'HTTP/ConditionalGet.php';
 
 // emulate regularly updating document
 $every = 20;
diff --git a/lib/HTTP/ConditionalGet/test/5.php b/web/test/HTTP_ConditionalGet/5.php
similarity index 87%
rename from lib/HTTP/ConditionalGet/test/5.php
rename to web/test/HTTP_ConditionalGet/5.php
index 2b2f0f0..41abfc6 100644
--- a/lib/HTTP/ConditionalGet/test/5.php
+++ b/web/test/HTTP_ConditionalGet/5.php
@@ -1,6 +1,7 @@
 <?php
 
-require '../../ConditionalGet.php';
+require '../../config.php';
+require 'HTTP/ConditionalGet.php';
 
 // far expires
 $cg = new HTTP_ConditionalGet(array(
diff --git a/lib/HTTP/ConditionalGet/test/_include.php b/web/test/HTTP_ConditionalGet/_include.php
similarity index 100%
rename from lib/HTTP/ConditionalGet/test/_include.php
rename to web/test/HTTP_ConditionalGet/_include.php
diff --git a/lib/HTTP/ConditionalGet/test/index.php b/web/test/HTTP_ConditionalGet/index.php
similarity index 93%
rename from lib/HTTP/ConditionalGet/test/index.php
rename to web/test/HTTP_ConditionalGet/index.php
index 1483ea9..ef81b5f 100644
--- a/lib/HTTP/ConditionalGet/test/index.php
+++ b/web/test/HTTP_ConditionalGet/index.php
@@ -1,6 +1,7 @@
 <?php
 
-require '../../ConditionalGet.php';
+require '../../config.php';
+require 'HTTP/ConditionalGet.php';
 
 // emulate regularly updating document
 $every = 20;
diff --git a/lib/HTTP/Encoder/test/green.png b/web/test/HTTP_Encoder/green.png
similarity index 100%
rename from lib/HTTP/Encoder/test/green.png
rename to web/test/HTTP_Encoder/green.png
diff --git a/lib/HTTP/Encoder/test/index.php b/web/test/HTTP_Encoder/index.php
similarity index 95%
rename from lib/HTTP/Encoder/test/index.php
rename to web/test/HTTP_Encoder/index.php
index 47ed4e5..fd8b2f9 100644
--- a/lib/HTTP/Encoder/test/index.php
+++ b/web/test/HTTP_Encoder/index.php
@@ -1,7 +1,8 @@
 <?php
 ini_set('display_errors', 'on');
 
-require '../../Encoder.php';
+require '../../config.php';
+require 'HTTP/Encoder.php';
 
 if (!isset($_GET['test'])) {
     $type = 'text/html';