diff --git a/airtime_mvc/tests/application/bootstrap.php b/airtime_mvc/tests/application/bootstrap.php
index 568ac0ef2..d752e80bd 100644
--- a/airtime_mvc/tests/application/bootstrap.php
+++ b/airtime_mvc/tests/application/bootstrap.php
@@ -21,11 +21,20 @@ set_include_path(implode(PATH_SEPARATOR, array(
     realpath(APPLICATION_PATH . '/../library')
 )));
 
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+    get_include_path(),
+    realpath(APPLICATION_PATH . '/../../install_minimal/include')
+)));
+
 set_include_path(APPLICATION_PATH . '/common' . PATH_SEPARATOR . get_include_path());
 
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
 
+//Services
+set_include_path(APPLICATION_PATH . '/services' . PATH_SEPARATOR . get_include_path());
+
 //Controller plugins.
 set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path());
 
@@ -36,8 +45,4 @@ if (file_exists('/usr/share/php/libzend-framework-php')) {
 
 require_once 'Zend/Application.php';
 require_once 'Zend/Config.php';
-require_once 'Zend/Session.php';
 #require_once 'DatabaseTestCase.php';
-
-//Start the Session TODO: Move to an _initSession() function in a class
-Zend_Session::start();
diff --git a/airtime_mvc/tests/application/models/ShowTest.php b/airtime_mvc/tests/application/models/ShowTest.php
index 1ea6e1517..0afc317f3 100644
--- a/airtime_mvc/tests/application/models/ShowTest.php
+++ b/airtime_mvc/tests/application/models/ShowTest.php
@@ -1,5 +1,7 @@
 <?php
 require_once "Zend/Test/PHPUnit/DatabaseTestCase.php";
+require_once "ShowService.php";
+require_once "AirtimeInstall.php";
 
 class ShowTest extends Zend_Test_PHPUnit_DatabaseTestCase
 {