diff --git a/test/TestTemplate.php b/test/TestTemplate.php
index 9e4800be..37bef48f 100644
--- a/test/TestTemplate.php
+++ b/test/TestTemplate.php
@@ -105,8 +105,8 @@ class TestTemplate extends PHPUnit_Framework_TestCase
         exec($createDBCommand);
 
         $scripts = array(
-            APP_BASE_PATH."scripts/icehrmdb.sql",
-            APP_BASE_PATH."scripts/icehrm_master_data.sql"
+            APP_BASE_PATH."core/scripts/icehrmdb.sql",
+            APP_BASE_PATH."core/scripts/icehrm_master_data.sql"
         );
 
         foreach ($scripts as $insql) {
diff --git a/test/test.config.php b/test/test.config.php
index 9e51dcc1..854331fe 100644
--- a/test/test.config.php
+++ b/test/test.config.php
@@ -13,13 +13,13 @@ define('CLIENT_NAME', 'app');
 
 if (!defined('MYSQL_ROOT_USER') || !defined('MYSQL_ROOT_PASS')) {
     //Tests running on vagrant
-    define('APP_BASE_PATH', TEST_BASE_PATH.'../');
+    define('APP_BASE_PATH', TEST_BASE_PATH.'../core/');
     define('CLIENT_BASE_PATH', TEST_BASE_PATH.'../../deployment/clients/test/');
     define('BASE_URL', 'http://app.app.dev/');
     define('CLIENT_BASE_URL', 'http://clients.app.dev/dev/');
 } else {
     //Tests running on deploy
-    define('APP_BASE_PATH', realpath(dirname(__FILE__).'/../app')."/");
+    define('APP_BASE_PATH', realpath(dirname(__FILE__).'/../app')."/core/");
     define('CLIENT_BASE_PATH', APP_BASE_PATH.'');
     define('BASE_URL', 'http://apps.gamonoid.com/icehrmcore/');
     define('CLIENT_BASE_URL', 'http://apps.gamonoid.com/icehrm/');
diff --git a/test/test.includes.php b/test/test.includes.php
index 5afea27a..a3c72936 100644
--- a/test/test.includes.php
+++ b/test/test.includes.php
@@ -34,5 +34,5 @@ if (!class_exists('SessionUtils')) {
 if (!class_exists('TestTemplate')) {
     include(dirname(__FILE__).'/TestTemplate.php');
     include(dirname(__FILE__).'/helper/EmployeeTestDataHelper.php');
-    include(APP_BASE_PATH."core/includes.inc.php");
+    include(APP_BASE_PATH."includes.inc.php");
 }