diff --git a/.gitignore b/.gitignore
index 57be4e31..bebd336c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+vendor
+composer.phar
 phpunit.xml
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 7585d498..c60dc301 100644
--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,18 @@
     {
       "type": "vcs",
       "url": "https://github.com/mlehner/gelf-php"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/msabramo/gelf-php-1"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/msabramo/gelf-php"
     }
   ],
   "suggest": {
-    "gelf-php": ">=0"
+    "mlehner/gelf-php": "dev-add-composer-support"
   },
   "autoload": {
     "psr-0": {"Monolog": "src/"}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 00000000..034897c8
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,11 @@
+{
+    "hash": "5715c4c52bc66b23002954fb3a2f47e4",
+    "packages": [
+        {
+            "package": "mlehner/gelf-php",
+            "version": "dev-add-composer-support",
+            "source-reference": "39419c2b75daf6b9eb9feb6ac0541807ee888cda"
+        }
+    ],
+    "aliases": []
+}
diff --git a/tests/Monolog/Handler/GelfHandlerTest.php b/tests/Monolog/Handler/GelfHandlerTest.php
index 1633bd29..cfd2f640 100644
--- a/tests/Monolog/Handler/GelfHandlerTest.php
+++ b/tests/Monolog/Handler/GelfHandlerTest.php
@@ -11,14 +11,15 @@
 
 namespace Monolog\Handler;
 
+use Monolog\TestCase;
 use Monolog\Logger;
 use Gelf\MessagePublisher;
 
-class GelfHandlerTest extends \PHPUnit_Framework_TestCase
+class GelfHandlerTest extends TestCase
 {
     public function setUp()
     {
-        if (!class_exists("MessagePublisher"))
+        if (!class_exists("Gelf\MessagePublisher"))
         {
             $this->markTestSkipped("https://github.com/mlehner/gelf-php not installed");
         }
@@ -35,6 +36,14 @@ class GelfHandlerTest extends \PHPUnit_Framework_TestCase
 
     protected function getMessagePublisher()
     {
-        return new MessagePublisher();
+        return new MessagePublisher('localhost');
+    }
+
+    public function testStuff()
+    {
+        $handler = new GelfHandler($this->getMessagePublisher());
+        $handler->setFormatter($this->getIdentityFormatter());
+        $handler->handle($this->getRecord(Logger::DEBUG));
+        $handler->handle($this->getRecord(Logger::WARNING));
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e3610ebc..dc92e51d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+require_once __DIR__ . "/../vendor/.composer/autoload.php";
 require_once __DIR__.'/Monolog/TestCase.php';
 
 spl_autoload_register(function($class)