diff --git a/composer.json b/composer.json
index 172e801..ebec5a4 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "psr/http-message": "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.5.x"
+        "phpunit/phpunit": "~4.6"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index 000ee41..b3e5414 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "825703713a0e0eab25f1de28f7cc1c33",
+    "hash": "008c17b77c590b88be5f76a2ca05f37f",
     "packages": [
         {
             "name": "psr/http-message",
@@ -281,31 +281,33 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
-                    "File/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -322,7 +324,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2013-10-10 15:34:57"
+            "time": "2015-04-02 05:19:05"
         },
         {
             "name": "phpunit/php-text-template",
@@ -463,16 +465,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.5.1",
+            "version": "4.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4"
+                "reference": "163232991e652e6efed2f8470326fffa61e848e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
-                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/163232991e652e6efed2f8470326fffa61e848e2",
+                "reference": "163232991e652e6efed2f8470326fffa61e848e2",
                 "shasum": ""
             },
             "require": {
@@ -484,17 +486,17 @@
                 "php": ">=5.3.3",
                 "phpspec/prophecy": "~1.3,>=1.3.1",
                 "phpunit/php-code-coverage": "~2.0,>=2.0.11",
-                "phpunit/php-file-iterator": "~1.3.2",
+                "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
+                "phpunit/php-timer": "~1.0",
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.1",
+                "sebastian/diff": "~1.2",
                 "sebastian/environment": "~1.2",
                 "sebastian/exporter": "~1.2",
                 "sebastian/global-state": "~1.0",
                 "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
+                "symfony/yaml": "~2.1|~3.0"
             },
             "suggest": {
                 "phpunit/php-invoker": "~1.1"
@@ -505,7 +507,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.5.x-dev"
+                    "dev-master": "4.6.x-dev"
                 }
             },
             "autoload": {
@@ -531,7 +533,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-03-29 09:24:05"
+            "time": "2015-04-11 05:23:21"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
deleted file mode 100644
index 1752bfc..0000000
--- a/phpdoc.dist.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<phpdoc>
-    <title>WellRESTed</title>
-    <parser>
-        <target>phpdoc</target>
-        <markers>
-            <item>TODO</item>
-            <item>FIXME</item>
-        </markers>
-    </parser>
-    <transformer>
-        <target>phpdoc</target>
-    </transformer>
-    <transformations>
-        <template name="responsive" />
-    </transformations>
-    <files>
-        <directory>src</directory>
-        <ignore>test/*</ignore>
-    </files>
-</phpdoc>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4a8f043..7a8e7e0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,26 +11,14 @@
         syntaxCheck="false"
         verbose="true"
         >
-    <php>
-        <!-- Port for testing the Client class. Set this to a port that is not used on the system.
-             Use a range (e.g., 2000-9000) to randomly pick a port within the boundaries.
-             To override, "export PORT=8081"
-        -->
-        <env name="PORT" value="2000-9000" />
-        <!-- Port for testing Client class failuers. Set this to a port that is not used on the system. -->
-        <env name="FAIL_PORT" value="9001-9100" />
-    </php>
     <testsuites>
         <testsuite name="unit">
-            <directory>./test/tests/unit/</directory>
-        </testsuite>
-        <testsuite name="integration">
-            <directory>./test/tests/integration/</directory>
+            <directory>./test/tests/unit</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">./src/</directory>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
     <logging>
diff --git a/src/Message/ServerRequest.php b/src/Message/ServerRequest.php
index cbb4400..48a5f4a 100644
--- a/src/Message/ServerRequest.php
+++ b/src/Message/ServerRequest.php
@@ -354,11 +354,6 @@ class ServerRequest extends Request implements ServerRequestInterface
      */
     protected function getServerRequestHeaders()
     {
-        // Prefer apache_request_headers is available.
-        if (function_exists("apache_request_headers")) {
-            return apache_request_headers();
-        }
-
         // http://www.php.net/manual/en/function.getallheaders.php#84262
         $headers = array();
         foreach ($_SERVER as $name => $value) {
diff --git a/test/src/apache_request_headers.php b/test/src/apache_request_headers.php
deleted file mode 100644
index 97d8b6d..0000000
--- a/test/src/apache_request_headers.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Add a dummy apache_request_headers method in the global namesapce.
- */
-
-if (!function_exists("apache_request_headers")) {
-    function apache_request_headers() {
-        return [];
-    }
-}
diff --git a/test/tests/unit/Message/ServerRequestTest.php b/test/tests/unit/Message/ServerRequestTest.php
index d5dec13..546596e 100644
--- a/test/tests/unit/Message/ServerRequestTest.php
+++ b/test/tests/unit/Message/ServerRequestTest.php
@@ -286,42 +286,6 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals("Bear", $attributes["dog"]);
     }
 
-    /**
-     * @covers WellRESTed\Message\ServerRequest::getServerRequestHeaders
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testReadsApacheRequestHeaders()
-    {
-        // This file adds a dummy apache_request_headers in the global namespace.
-        require_once(__DIR__ . "/../../../src/apache_request_headers.php");
-
-        $_SERVER = [
-            "HTTP_HOST" => "localhost",
-            "HTTP_ACCEPT" => "application/json",
-            "QUERY_STRING" => "guinea_pig=Claude&hamster=Fizzgig"
-        ];
-        $_COOKIE = [
-            "cat" => "Molly"
-        ];
-        $_FILES = [
-            "file" => [
-                "name" => "MyFile.jpg",
-                "type" => "image/jpeg",
-                "tmp_name" => "/tmp/php/php6hst32",
-                "error" => "UPLOAD_ERR_OK",
-                "size" => 98174
-            ]
-        ];
-        $_POST = [
-            "dog" => "Bear"
-        ];
-
-        $request = ServerRequest::getServerRequest();
-        $headers = $request->getHeaders();
-        $this->assertNotNull($headers);
-    }
-
     /**
      * @covers WellRESTed\Message\ServerRequest::readFromServerRequest
      * @preserveGlobalState disabled