diff --git a/.travis.yml b/.travis.yml
index 12c6ba92..1c56368b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 # docs available at http://docs.travis-ci.com/user/languages/php/
 # example available at https://github.com/travis-ci/travis-ci-php-example
+dist: trusty
+sudo: false
 language: php
 
 before_script:
@@ -12,9 +14,9 @@ install:
   # TODO Install geos library -- as a matrix test
   # TODO optionally set up a postgis database for testing
 
-script: 
+script:
+  - ./vendor/bin/phpunit --verbose --colors --stderr --bootstrap tests/tests/bootstrap.php tests
   - cd tests
-  - phpunit --verbose --colors --stderr tests
   - php test.php
 
 # run tests on the following versions
@@ -22,8 +24,10 @@ php:
   - 5.6
   - 5.5
   - 5.4
-  - 5.3
   - hhvm
-  
+
 matrix:
   fast_finish: false
+  include:
+    - php: 5.3
+      dist: precise
diff --git a/composer.json b/composer.json
index a02eba8a..21d287cc 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "description": "GeoPHP is a open-source native PHP library for doing geometry operations. It is written entirely in PHP and can therefore run on shared hosts. It can read and write a wide variety of formats: WKT (including EWKT), WKB (including EWKB), GeoJSON, KML, GPX, GeoRSS). It works with all Simple-Feature geometries (Point, LineString, Polygon, GeometryCollection etc.) and can be used to get centroids, bounding-boxes, area, and a wide variety of other useful information.",
     "homepage": "https://github.com/phayes/geoPHP",
     "autoload": {
-        "classmap": ["geoPHP.inc"]
+        "files": ["geoPHP.inc"]
     },
     "authors":[
         {
diff --git a/tests/test.php b/tests/test.php
index 9f4fe91c..957220c5 100644
--- a/tests/test.php
+++ b/tests/test.php
@@ -15,7 +15,7 @@ function run_test() {
 
   header("Content-type: text");
 
-  include_once('../geoPHP.inc');
+  include_once(__DIR__ . '/tests/bootstrap.php');
 
   if (geoPHP::geosInstalled()) {
     print "GEOS is installed.\n";
@@ -24,11 +24,12 @@ function run_test() {
     print "GEOS is not installed.\n";
   }
 
-  foreach (scandir('./input') as $file) {
+  $input_dir = __DIR__ . '/input/';
+  foreach (scandir($input_dir) as $file) {
     $parts = explode('.',$file);
     if ($parts[0]) {
       $format = $parts[1];
-      $value = file_get_contents('./input/'.$file);
+      $value = file_get_contents($input_dir . $file);
       print '---- Testing '.$file."\n";
       $geometry = geoPHP::load($value, $format);
       test_adapters($geometry, $format, $value);
diff --git a/tests/tests/20120702Test.php b/tests/tests/20120702Test.php
index 5486e0a5..c0dfc5e1 100644
--- a/tests/tests/20120702Test.php
+++ b/tests/tests/20120702Test.php
@@ -1,5 +1,5 @@
 <?php
-require_once('../geoPHP.inc');
+
 class Tests_20120702 extends PHPUnit_Framework_TestCase {
 
   function setUp() {
@@ -8,7 +8,7 @@ function setUp() {
 
   function testMethods() {
     $format = 'gpx';
-    $value = file_get_contents('./input/20120702.gpx');
+    $value = file_get_contents(__DIR__ . '/../input/20120702.gpx');
     $geometry = geoPHP::load($value, $format);
 
     $methods = array(
@@ -284,4 +284,3 @@ function _methods_tester($geometry, $method_name, $argument) {
     }
   }
 }
-
diff --git a/tests/tests/adaptersTest.php b/tests/tests/adaptersTest.php
index 69d0a603..e3b988d9 100644
--- a/tests/tests/adaptersTest.php
+++ b/tests/tests/adaptersTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once('../geoPHP.inc');
+
 class AdaptersTests extends PHPUnit_Framework_TestCase {
 
   function setUp() {
@@ -7,11 +7,12 @@ function setUp() {
   }
 
   function testAdapters() {
-    foreach (scandir('./input') as $file) {
+    $input_dir = __DIR__ . '/../input/';
+    foreach (scandir($input_dir) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];
-        $input = file_get_contents('./input/'.$file);
+        $input = file_get_contents($input_dir . $file);
         echo "\nloading: " . $file . " for format: " . $format;
         $geometry = geoPHP::load($input, $format);
 
diff --git a/tests/tests/bootstrap.php b/tests/tests/bootstrap.php
index 7d01cb08..05c4a2a8 100644
--- a/tests/tests/bootstrap.php
+++ b/tests/tests/bootstrap.php
@@ -1,7 +1,6 @@
 <?php
-require_once ('../geoPHP.inc');
 if (!@include __DIR__ . '/../../vendor/autoload.php') {
     die('You must set up the project dependencies, run the following commands:
         wget http://getcomposer.org/composer.phar
         php composer.phar install');
-}
\ No newline at end of file
+}
diff --git a/tests/tests/geohashTest.php b/tests/tests/geohashTest.php
index 19949082..263b87c2 100644
--- a/tests/tests/geohashTest.php
+++ b/tests/tests/geohashTest.php
@@ -1,5 +1,4 @@
 <?php
-require_once ('../geoPHP.inc');
 
 class GeoHashTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/tests/geosTest.php b/tests/tests/geosTest.php
index 9233b377..76ae4da8 100644
--- a/tests/tests/geosTest.php
+++ b/tests/tests/geosTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once('../geoPHP.inc');
+
 class GeosTests extends PHPUnit_Framework_TestCase {
 
   function setUp() {
@@ -8,8 +8,7 @@ function setUp() {
 
   function testGeos() {
     if (!geoPHP::geosInstalled()) {
-      echo "Skipping GEOS -- not installed";
-      return;
+      $this->markTestSkipped('Skipping GEOS -- not installed');
     }
     foreach (scandir('./input') as $file) {
       $parts = explode('.',$file);
diff --git a/tests/tests/methodsTest.php b/tests/tests/methodsTest.php
index a946b4a7..c3659474 100644
--- a/tests/tests/methodsTest.php
+++ b/tests/tests/methodsTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once('../geoPHP.inc');
+
 class MethodsTests extends PHPUnit_Framework_TestCase {
 
   function setUp() {
@@ -7,11 +7,12 @@ function setUp() {
   }
 
   function testMethods() {
-    foreach (scandir('./input') as $file) {
+    $input_dir = __DIR__ . '/../input/';
+    foreach (scandir($input_dir) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
+        $value = file_get_contents($input_dir . $file);
         echo "\nloading: " . $file . " for format: " . $format;
         $geometry = geoPHP::load($value, $format);
 
diff --git a/tests/tests/placeholdersTest.php b/tests/tests/placeholdersTest.php
index 90b1c3f1..9ce2602e 100644
--- a/tests/tests/placeholdersTest.php
+++ b/tests/tests/placeholdersTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once('../geoPHP.inc');
+
 class PlaceholdersTests extends PHPUnit_Framework_TestCase {
 
   function setUp() {
@@ -7,11 +7,12 @@ function setUp() {
   }
 
   function testPlaceholders() {
-    foreach (scandir('./input') as $file) {
+    $input_dir = __DIR__ . '/../input/';
+    foreach (scandir($input_dir) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
+        $value = file_get_contents($input_dir . $file);
         echo "\nloading: " . $file . " for format: " . $format;
         $geometry = geoPHP::load($value, $format);