diff --git a/src/RequestParser.php b/src/RequestParser.php
index 2a5c2873..3de260a6 100644
--- a/src/RequestParser.php
+++ b/src/RequestParser.php
@@ -9,7 +9,7 @@
  * @event headers
  * @event error
  */
-class RequestParser extends EventEmitter
+class RequestParser extends EventEmitter implements RequestParserInterface
 {
     private $buffer = '';
     private $maxSize = 4096;
diff --git a/src/RequestParserFactory.php b/src/RequestParserFactory.php
new file mode 100644
index 00000000..baafdabb
--- /dev/null
+++ b/src/RequestParserFactory.php
@@ -0,0 +1,12 @@
+<?php namespace React\Http;
+
+class RequestParserFactory implements RequestParserFactoryInterface
+{
+    /**
+     * @return RequestParser
+     */
+    public function create()
+    {
+        return new RequestParser();
+    }
+}
\ No newline at end of file
diff --git a/src/RequestParserFactoryInterface.php b/src/RequestParserFactoryInterface.php
new file mode 100644
index 00000000..31cf1e37
--- /dev/null
+++ b/src/RequestParserFactoryInterface.php
@@ -0,0 +1,9 @@
+<?php namespace React\Http;
+
+interface RequestParserFactoryInterface
+{
+    /**
+     * @return RequestParserInterface
+     */
+    public function create();
+}
\ No newline at end of file
diff --git a/src/RequestParserInterface.php b/src/RequestParserInterface.php
new file mode 100644
index 00000000..e0e5e57c
--- /dev/null
+++ b/src/RequestParserInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace React\Http;
+
+use Evenement\EventEmitterInterface;
+
+/**
+ * @event headers
+ * @event error
+ */
+interface RequestParserInterface extends EventEmitterInterface {
+
+    /**
+     * @param $data
+     * @return null
+     */
+    public function feed($data);
+
+}
\ No newline at end of file
diff --git a/src/Server.php b/src/Server.php
index 5e420a40..50151bc7 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -11,15 +11,16 @@ class Server extends EventEmitter implements ServerInterface
 {
     private $io;
 
-    public function __construct(SocketServerInterface $io)
+    public function __construct(SocketServerInterface $io, RequestParserFactoryInterface $parserFactory = null)
     {
         $this->io = $io;
 
-        $this->io->on('connection', function (ConnectionInterface $conn) {
+        $this->io->on('connection', function (ConnectionInterface $conn) use ($parserFactory) {
             // TODO: http 1.1 keep-alive
             // TODO: chunked transfer encoding (also for outgoing data)
 
-            $parser = new RequestParser();
+            $parserFactory = $parserFactory ?: new RequestParserFactory();
+            $parser = $parserFactory->create();
             $parser->on('headers', function (Request $request, $bodyBuffer) use ($conn, $parser) {
                 // attach remote ip to the request as metadata
                 $request->remoteAddress = $conn->getRemoteAddress();
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index 4d4f1c74..570c7255 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -66,6 +66,24 @@ public function testResponseContainsPoweredByHeader()
         $this->assertContains("\r\nX-Powered-By: React/alpha\r\n", $conn->getData());
     }
 
+    public function testServerUsesProvidedRequestParserFactory()
+    {
+        $io = new ServerStub();
+
+        /** @var \React\Http\RequestParser|\PHPUnit_Framework_MockObject_MockObject $parser */
+        $parser = $this->getMockBuilder('React\Http\RequestParser')->getMock();
+        $parser->expects($this->once())->method('on');
+
+        /** @var \React\Http\RequestParserFactory | \PHPUnit_Framework_MockObject_MockObject $parserFactory */
+        $parserFactory = $this->getMockBuilder('React\Http\RequestParserFactory')->getMock();
+        $parserFactory->expects($this->once())->method('create')->willReturn($parser);
+
+        new Server($io, $parserFactory);
+
+        $conn = new ConnectionStub();
+        $io->emit('connection', array($conn));
+    }
+
     private function createGetRequest()
     {
         $data = "GET / HTTP/1.1\r\n";