diff --git a/.atoum.php b/.atoum.php
new file mode 100644
index 0000000..247c40f
--- /dev/null
+++ b/.atoum.php
@@ -0,0 +1,3 @@
+<?php
+
+$runner->addTestsFromDirectory(__DIR__.'/tests');
\ No newline at end of file
diff --git a/.bootstrap.atoum.php b/.bootstrap.atoum.php
new file mode 100644
index 0000000..a3c5eed
--- /dev/null
+++ b/.bootstrap.atoum.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__.'/vendor/autoload.php';
diff --git a/.travis.yml b/.travis.yml
index 40265da..54b07b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ before_script:
   - php composer.phar install --dev
 
 script:
-  - vendor/bin/atoum -d tests -bf tests/bootstrap.php
+  - vendor/bin/atoum
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 863ddfc..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
-    ],
-    "hash": "ba6f0203c91f8fa27814d876aacd1164",
-    "packages": [
-
-    ],
-    "packages-dev": [
-        {
-            "name": "atoum/atoum",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/atoum/atoum.git",
-                "reference": "a68f36516b49455eec28fc01323bb4dae8b6704f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/atoum/atoum/zipball/a68f36516b49455eec28fc01323bb4dae8b6704f",
-                "reference": "a68f36516b49455eec28fc01323bb4dae8b6704f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-hash": "*",
-                "ext-json": "*",
-                "ext-session": "*",
-                "ext-tokenizer": "*",
-                "ext-xml": "*",
-                "php": ">=5.3.3"
-            },
-            "replace": {
-                "mageekguy/atoum": "*"
-            },
-            "suggest": {
-                "ext-mbstring": "Provides support for UTF-8 strings"
-            },
-            "bin": [
-                "bin/atoum"
-            ],
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "classes/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD"
-            ],
-            "authors": [
-                {
-                    "name": "Frédéric Hardy",
-                    "email": "frederic.hardy@atoum.org",
-                    "homepage": "http://blog.mageekbox.net"
-                },
-                {
-                    "name": "François Dussert",
-                    "email": "francois.dussert@atoum.org"
-                },
-                {
-                    "name": "Gérald Croes",
-                    "email": "gerald.croes@atoum.org"
-                },
-                {
-                    "name": "Julien Bianchi",
-                    "email": "julien.bianchi@atoum.org"
-                },
-                {
-                    "name": "Ludovic Fleury",
-                    "email": "ludovic.fleury@atoum.org"
-                }
-            ],
-            "description": "Simple modern and intuitive unit testing framework for PHP 5.3+",
-            "homepage": "http://www.atoum.org",
-            "keywords": [
-                "TDD",
-                "atoum",
-                "test",
-                "unit testing"
-            ],
-            "time": "2013-11-14 13:13:05"
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "atoum/atoum": 20
-    },
-    "platform": {
-        "php": ">=5.4.0"
-    },
-    "platform-dev": [
-
-    ]
-}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index ffa5070..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-require_once __DIR__.'/../vendor/autoload.php';
-require_once __DIR__.'/../vendor/atoum/atoum/scripts/runner.php';