diff --git a/min_unit_tests/HTTP_ConditionalGet/2.php b/min_unit_tests/HTTP_ConditionalGet/2.php
index 9b66f24..cc73957 100644
--- a/min_unit_tests/HTTP_ConditionalGet/2.php
+++ b/min_unit_tests/HTTP_ConditionalGet/2.php
@@ -1,7 +1,6 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . '/../../min/lib'));
-require 'HTTP/ConditionalGet.php';
+require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php';
 
 // emulate regularly updating document
 $every = 20;
diff --git a/min_unit_tests/HTTP_ConditionalGet/3.php b/min_unit_tests/HTTP_ConditionalGet/3.php
index 8f5482b..4ad68ff 100644
--- a/min_unit_tests/HTTP_ConditionalGet/3.php
+++ b/min_unit_tests/HTTP_ConditionalGet/3.php
@@ -1,7 +1,6 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . '/../../min/lib'));
-require 'HTTP/ConditionalGet.php';
+require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php';
 
 // generate content first (not ideal)
 // emulate regularly updating document
@@ -37,4 +36,4 @@ $cg->setContentLength(strlen($content));
 $cg->sendHeaders();
 
 send_slowly($content);
-
+
diff --git a/min_unit_tests/HTTP_ConditionalGet/4.php b/min_unit_tests/HTTP_ConditionalGet/4.php
index 4b77d20..aec6ead 100644
--- a/min_unit_tests/HTTP_ConditionalGet/4.php
+++ b/min_unit_tests/HTTP_ConditionalGet/4.php
@@ -1,13 +1,11 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . '/../../min/lib'));
-require 'HTTP/ConditionalGet.php';
+require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php';
 
 // emulate regularly updating document
 $every = 20;
 $lastModified = round(time()/$every)*$every - $every;
 
-require 'HTTP/Encoder.php';
 list($enc,) = HTTP_Encoder::getAcceptedEncoding();
 
 $cg = new HTTP_ConditionalGet(array(
diff --git a/min_unit_tests/HTTP_ConditionalGet/5.php b/min_unit_tests/HTTP_ConditionalGet/5.php
index b443c19..d1618b6 100644
--- a/min_unit_tests/HTTP_ConditionalGet/5.php
+++ b/min_unit_tests/HTTP_ConditionalGet/5.php
@@ -1,7 +1,6 @@
 <?php
 
-set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . '/../../min/lib'));
-require 'HTTP/ConditionalGet.php';
+require dirname(__FILE__) . '/../../min/lib/Minify/Loader.php';
 
 // far expires
 $cg = new HTTP_ConditionalGet(array(