diff --git a/.travis.yml b/.travis.yml
index df64cb1..37ee76c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,8 @@ before_script:
   - sh -c "psql -c 'DROP DATABASE IF EXISTS test;' -U postgres"
   - sh -c "psql -c 'create database test;' -U postgres"
   - sh -c "mysql -e 'create database IF NOT EXISTS test;'"
-  - sh -c "cd tests"
 
-script: phpunit .
+script: cd tests && phpunit
 
 matrix:
   allow_failures:
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b2fbcbd..a3d893f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -73,7 +73,7 @@ class Query_TestCase extends PHPUnit_Framework_TestCase {
  * Unit test bootstrap - Using phpunit
  */
 define('QTEST_DIR', realpath(dirname(__FILE__)));
-define('QBASE_DIR', realpath("../").'/');
+define('QBASE_DIR', realpath(QTEST_DIR.'/../') . '/');
 define('QDS', DIRECTORY_SEPARATOR);
 
 // Include db classes