diff --git a/composer.json b/composer.json
index f14c110..9fdf277 100644
--- a/composer.json
+++ b/composer.json
@@ -4,6 +4,9 @@
         "twig/twig": "1.8.*",
         "symfony/twig-bridge": "2.1.*"
     },
+    "require-dev": {
+        "symfony/filesystem": "2.1.*"
+    },
     "minimum-stability": "dev",
     "autoload": {
         "psr-0": {
diff --git a/composer.lock b/composer.lock
index 0b528b5..3762eea 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,5 +1,5 @@
 {
-    "hash": "8909d5f3ac695303e7845fe5cb0658ad",
+    "hash": "dc3d686dcf8316d609533312d943dba3",
     "packages": [
         {
             "package": "pimple/pimple",
@@ -22,8 +22,8 @@
         {
             "package": "silex/silex",
             "version": "dev-master",
-            "source-reference": "23dc19c334e2f74ec4de037568f5426bceaff421",
-            "commit-date": "1341597562"
+            "source-reference": "4679d476aee0a5981b13d4ac899a8ef72b8b060c",
+            "commit-date": "1341899486"
         },
         {
             "package": "symfony/event-dispatcher",
@@ -34,8 +34,8 @@
         {
             "package": "symfony/event-dispatcher",
             "version": "dev-master",
-            "source-reference": "v2.1.0-BETA1",
-            "commit-date": "1338018513"
+            "source-reference": "0dc437f2eca7dea19facfde6db7f7f5e8e71d0bc",
+            "commit-date": "1341838460"
         },
         {
             "package": "symfony/http-foundation",
@@ -46,8 +46,8 @@
         {
             "package": "symfony/http-foundation",
             "version": "dev-master",
-            "source-reference": "3e53f0a9f802dc1f34a722109df0b0d2679671a8",
-            "commit-date": "1341379664"
+            "source-reference": "985f3aa6c9f8074b2d1a12345e0768f8c24aa72d",
+            "commit-date": "1341838460"
         },
         {
             "package": "symfony/http-kernel",
@@ -58,8 +58,8 @@
         {
             "package": "symfony/http-kernel",
             "version": "dev-master",
-            "source-reference": "6d6f55f6b07b8bfed741a192def8d1bfbf6c590f",
-            "commit-date": "1341332120"
+            "source-reference": "b9fa4070ef08ed1d0f39e5e51f38cdc985742e99",
+            "commit-date": "1341931207"
         },
         {
             "package": "symfony/routing",
@@ -70,8 +70,8 @@
         {
             "package": "symfony/routing",
             "version": "dev-master",
-            "source-reference": "622a168a3be54a87e34ad65e9d50a738fb89ff7e",
-            "commit-date": "1341312726"
+            "source-reference": "67c72b042d753e6ee3675eb4b0c2165243d34055",
+            "commit-date": "1341890620"
         },
         {
             "package": "symfony/twig-bridge",
@@ -82,15 +82,28 @@
         {
             "package": "symfony/twig-bridge",
             "version": "dev-master",
-            "source-reference": "2a577b6cf0fe32f383acf4a972c1d5d8f48ae1e2",
-            "commit-date": "1340549862"
+            "source-reference": "5d3e234a5d366f510185a9de3a545b730f327632",
+            "commit-date": "1341913448"
         },
         {
             "package": "twig/twig",
             "version": "v1.8.3"
         }
     ],
-    "packages-dev": null,
+    "packages-dev": [
+        {
+            "package": "symfony/filesystem",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/filesystem",
+            "version": "dev-master",
+            "source-reference": "v2.1.0-BETA2",
+            "commit-date": "1340092395"
+        }
+    ],
     "aliases": [
 
     ],
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index b576049..5daa48a 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -4,27 +4,7 @@ require 'vendor/autoload.php';
 
 use Git\Client;
 use Git\Repository;
-
-function recursiveDelete($dir)
-{
-    $files = scandir($dir);
-
-    foreach ($files as $file) {
-        if ($file == '.' || $file == '..') {
-            continue;
-        }
-        
-        $path = "$dir/$file";
-        
-        if (is_dir($path)) {
-            recursiveDelete($path);
-        } else {
-            unlink($path);
-        }
-    }
-
-    rmdir($dir);
-}
+use Symfony\Component\Filesystem\Filesystem;
 
 class ClientTest extends PHPUnit_Framework_TestCase
 {
@@ -43,7 +23,7 @@ class ClientTest extends PHPUnit_Framework_TestCase
         }
 
         $app = new Silex\Application();
-        $app['git.client'] = '/usr/bin/git';
+        $app['git.client'] = getenv('GIT_CLIENT') ?: '/usr/bin/git';
         $app['hidden'] = array();
         $this->client = new Client($app);
     }
@@ -377,6 +357,7 @@ class ClientTest extends PHPUnit_Framework_TestCase
     
     public static function tearDownAfterClass()
     {
-        recursiveDelete('/tmp/gitlist');
+        $fs = new Filesystem();
+        $fs->remove('/tmp/gitlist');
     }
 }