diff --git a/README.md b/README.md
index cd89514c32..887dd81346 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Known
+Known [![Build Status](https://travis-ci.org/idno/Known.svg?branch=master)](https://travis-ci.org/idno/Known)
 =====
 Known is a publishing platform for everyone.
 
diff --git a/Tests/Homepage.php b/Tests/HomepageTest.php
similarity index 61%
rename from Tests/Homepage.php
rename to Tests/HomepageTest.php
index 3cc0c699d1..34eaa837a6 100644
--- a/Tests/Homepage.php
+++ b/Tests/HomepageTest.php
@@ -2,15 +2,12 @@
 
     namespace Tests {
 
-        class Homepage extends \PHPUnit_Framework_TestCase {
+        class HomepageTest extends \PHPUnit_Framework_TestCase {
 
             function testHomepageLoads() {
 
-                // Load Known framework
-                require_once(dirname(dirname(__FILE__)) . '/Idno/start.php');
-
                 // Get the rendered homepage
-                $contents = file_get_contents(\Idno\Core\site()->config()->url);
+                $contents = file_get_contents(\Idno\Core\site()->config()->url); 
 
                 // Make sure it's not empty
                 $this->assertNotEmpty($contents);
diff --git a/Tests/_bootstrap.php b/Tests/_bootstrap.php
index f36fc70057..9bd5221ba4 100644
--- a/Tests/_bootstrap.php
+++ b/Tests/_bootstrap.php
@@ -1,2 +1,4 @@
 <?php
-// This is global bootstrap for autoloading 
+
+// Load Known framework
+require_once(dirname(dirname(__FILE__)) . '/Idno/start.php');
diff --git a/phpunit.xml b/phpunit.xml
index 18289ebef1..8a7ca722e2 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true">
+<phpunit colors="true" bootstrap="./Tests/_bootstrap.php">
     <testsuites>
         <testsuite name="Idno Basic Unit Tests">
             <directory>./Tests/</directory>