diff --git a/composer.json b/composer.json
index cae3c958cb48..5606dbc21c5b 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Google\\Cloud\\Dev\\": "dev/src"
+            "Google\\Cloud\\Dev\\": "dev/src",
+            "Google\\Cloud\\Tests\\System\\": "tests/system"
         }
     },
     "scripts": {
diff --git a/phpunit.system.xml b/phpunit.system.xml
new file mode 100644
index 000000000000..fe00c67b1d96
--- /dev/null
+++ b/phpunit.system.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./tests/system/bootstrap.php" colors="true">
+  <testsuites>
+    <testsuite>
+      <directory>tests/system</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">src</directory>
+      <exclude>
+        <directory suffix=".php">src/*/V[!a-zA-Z]*</directory>
+      </exclude>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f8f890f5319c..8afd82d909fa 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./tests/unit/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>tests/unit</directory>
     </testsuite>
   </testsuites>
   <filter>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index d21c14df8c2f..000000000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/tests/system/PubSub/ManageIAMPoliciesTest.php b/tests/system/PubSub/ManageIAMPoliciesTest.php
new file mode 100644
index 000000000000..161c7bf84987
--- /dev/null
+++ b/tests/system/PubSub/ManageIAMPoliciesTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Tests\System\PubSub;
+
+class ManageIAMPoliciesTest extends PubSubTestCase
+{
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testManageTopicIAM($client)
+    {
+        $topic = $client->createTopic(uniqid(self::TESTING_PREFIX));
+        self::$deletionQueue[] = $topic;
+        $this->assertIam($topic->iam());
+    }
+
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testManageSubscriptionIAM($client)
+    {
+        $topic = $client->createTopic(uniqid(self::TESTING_PREFIX));
+        self::$deletionQueue[] = $topic;
+        $sub = $client->subscribe(uniqid(self::TESTING_PREFIX), $topic->name());
+        self::$deletionQueue[] = $sub;
+
+        $this->assertIam($sub->iam());
+    }
+
+    private function assertIam($iam)
+    {
+        $policy = [
+            'bindings' => [
+                [
+                    'role' => 'roles/pubsub.admin',
+                    'members' => [
+                        'user:gcloud.php.tests@gmail.com'
+                    ]
+                ]
+            ]
+        ];
+        $iam->setPolicy($policy);
+        $actualPolicy = $iam->reload();
+
+        $this->assertEquals($policy['bindings'][0], $actualPolicy['bindings'][0]);
+    }
+}
diff --git a/tests/system/PubSub/ManageSubscriptionsTest.php b/tests/system/PubSub/ManageSubscriptionsTest.php
new file mode 100644
index 000000000000..bd62b754fe0b
--- /dev/null
+++ b/tests/system/PubSub/ManageSubscriptionsTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Tests\System\PubSub;
+
+class ManageSubscriptionsTest extends PubSubTestCase
+{
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testCreateAndListSubscriptions($client)
+    {
+        $topicName = uniqid(self::TESTING_PREFIX);
+        $topic = $client->createTopic($topicName);
+        $subsToCreate = [
+            uniqid(self::TESTING_PREFIX),
+            uniqid(self::TESTING_PREFIX)
+        ];
+
+        foreach ($subsToCreate as $subToCreate) {
+            self::$deletionQueue[] = $client->subscribe($subToCreate, $topicName);
+        }
+
+        $subs = $client->subscriptions();
+        $subsByTopic = $topic->subscriptions();
+
+        $this->assertSubsFound($subs, $subsToCreate);
+        $this->assertSubsFound($subsByTopic, $subsToCreate);
+    }
+
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testReloadSub($client)
+    {
+        $topicName = uniqid(self::TESTING_PREFIX);
+        $topic = $client->createTopic($topicName);
+        self::$deletionQueue[] = $topic;
+        $shortName = uniqid(self::TESTING_PREFIX);
+        $this->assertFalse($topic->subscription($shortName)->exists());
+        $sub = $client->subscribe($shortName, $topic->name());
+        self::$deletionQueue[] = $sub;
+
+        $this->assertTrue($topic->subscription($shortName)->exists());
+        $this->assertEquals($sub->name(), $sub->reload()['name']);
+    }
+
+    private function assertSubsFound($subs, $expectedSubs)
+    {
+        $foundSubs = [];
+        foreach ($subs as $sub) {
+            $sName = end(explode('/', $sub->name()));
+            foreach ($expectedSubs as $key => $expectedSub) {
+                if ($sName === $expectedSub) {
+                    $foundSubs[$key] = $sName;
+                }
+            }
+        }
+
+        $this->assertEquals($expectedSubs, $foundSubs);
+    }
+}
diff --git a/tests/system/PubSub/ManageTopicsTest.php b/tests/system/PubSub/ManageTopicsTest.php
new file mode 100644
index 000000000000..3a1e010c3c04
--- /dev/null
+++ b/tests/system/PubSub/ManageTopicsTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Tests\System\PubSub;
+
+class ManageTopicsTest extends PubSubTestCase
+{
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testCreateAndListTopics($client)
+    {
+        $foundTopics = [];
+        $topicsToCreate = [
+            uniqid(self::TESTING_PREFIX),
+            uniqid(self::TESTING_PREFIX)
+        ];
+
+        foreach ($topicsToCreate as $topicToCreate) {
+            self::$deletionQueue[] = $client->createTopic($topicToCreate);
+        }
+
+        $topics = $client->topics();
+
+        foreach ($topics as $topic) {
+            $tName = end(explode('/', $topic->name()));
+            foreach ($topicsToCreate as $key => $topicToCreate) {
+                if ($tName === $topicToCreate) {
+                    $foundTopics[$key] = $tName;
+                }
+            }
+        }
+
+        $this->assertEquals($topicsToCreate, $foundTopics);
+    }
+
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testReloadTopic($client)
+    {
+        $shortName = uniqid(self::TESTING_PREFIX);
+        $this->assertFalse($client->topic($shortName)->exists());
+        $topic = $client->createTopic($shortName);
+        self::$deletionQueue[] = $topic;
+
+        $this->assertTrue($client->topic($shortName)->exists());
+        $this->assertEquals($topic->name(), $topic->reload()['name']);
+    }
+}
diff --git a/tests/system/PubSub/PubSubTestCase.php b/tests/system/PubSub/PubSubTestCase.php
new file mode 100644
index 000000000000..07dd04d87ad0
--- /dev/null
+++ b/tests/system/PubSub/PubSubTestCase.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Tests\System\PubSub;
+
+use Google\Cloud\ExponentialBackoff;
+use Google\Cloud\PubSub\PubSubClient;
+
+class PubSubTestCase extends \PHPUnit_Framework_TestCase
+{
+    const TESTING_PREFIX = 'gcloud_testing_';
+
+    protected static $deletionQueue = [];
+    protected static $grpcClient;
+    protected static $restClient;
+    protected static $topic;
+    private static $hasSetUp = false;
+
+    public function clientProvider()
+    {
+        self::setUpBeforeClass();
+
+        return [
+            [self::$restClient],
+            [self::$grpcClient]
+        ];
+    }
+
+    public static function setUpBeforeClass()
+    {
+        if (self::$hasSetUp) {
+            return;
+        }
+
+        $keyFilePath = getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH');
+        self::$restClient = new PubSubClient([
+            'keyFilePath' => $keyFilePath,
+            'transport' => 'rest'
+        ]);
+        self::$grpcClient = new PubSubClient([
+            'keyFilePath' => $keyFilePath,
+            'transport' => 'grpc'
+        ]);
+        self::$hasSetUp = true;
+    }
+
+    public static function tearDownFixtures()
+    {
+        $backoff = new ExponentialBackoff(8);
+
+        foreach (self::$deletionQueue as $item) {
+            $backoff->execute(function () use ($item) {
+                $item->delete();
+            });
+        }
+    }
+}
+
+
diff --git a/tests/system/PubSub/PublishAndPullTest.php b/tests/system/PubSub/PublishAndPullTest.php
new file mode 100644
index 000000000000..d5fb6ee3c906
--- /dev/null
+++ b/tests/system/PubSub/PublishAndPullTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Tests\System\PubSub;
+
+class PublishAndPullTest extends PubSubTestCase
+{
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testPublishMessageAndPull($client)
+    {
+        $topicName = uniqid(self::TESTING_PREFIX);
+        $subName = uniqid(self::TESTING_PREFIX);
+        $topic = $client->createTopic($topicName);
+        $sub = $client->subscribe($subName, $topicName);
+        self::$deletionQueue[] = $topic;
+        self::$deletionQueue[] = $sub;
+
+        $message = [
+            'data' => 'A message.',
+            'attributes' => [
+                'location' => 'Detroit'
+            ]
+        ];
+        $topic->publish($message);
+
+        $messages = iterator_to_array($sub->pull());
+        $sub->modifyAckDeadline($messages[0], 15);
+        $sub->acknowledge($messages[0]);
+
+        $this->assertEquals($message['data'], $messages[0]->data());
+        $this->assertEquals($message['attributes'], $messages[0]->attributes());
+    }
+
+    /**
+     * @dataProvider clientProvider
+     */
+    public function testPublishMessagesAndPull($client)
+    {
+        $topicName = uniqid(self::TESTING_PREFIX);
+        $subName = uniqid(self::TESTING_PREFIX);
+        $topic = $client->createTopic($topicName);
+        $sub = $client->subscribe($subName, $topicName);
+        self::$deletionQueue[] = $topic;
+        self::$deletionQueue[] = $sub;
+
+        $messages = [
+            [
+                'data' => 'First.',
+                'attributes' => [
+                    'first' => 'yes'
+                ]
+            ],
+            [
+                'data' => 'Second.',
+                'attributes' => [
+                    'second' => 'yes'
+                ]
+            ]
+        ];
+
+        $topic->publishBatch($messages);
+
+        $actualMessages = iterator_to_array($sub->pull());
+        $sub->modifyAckDeadlineBatch($actualMessages, 15);
+        $sub->acknowledgeBatch($actualMessages);
+
+        $this->assertEquals($messages[0]['data'], $actualMessages[0]->data());
+        $this->assertEquals($messages[0]['attributes'], $actualMessages[0]->attributes());
+        $this->assertEquals($messages[1]['data'], $actualMessages[1]->data());
+        $this->assertEquals($messages[1]['attributes'], $actualMessages[1]->attributes());
+    }
+}
diff --git a/tests/system/bootstrap.php b/tests/system/bootstrap.php
new file mode 100644
index 000000000000..d020e3cc80f2
--- /dev/null
+++ b/tests/system/bootstrap.php
@@ -0,0 +1,15 @@
+<?php
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+use Google\Cloud\Tests\System\PubSub\PubSubTestCase;
+
+if (!getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH')) {
+    throw new \Exception(
+        'Please set the \'GOOGLE_CLOUD_PHP_TESTS_KEY_PATH\' env var to run the system tests'
+    );
+}
+
+register_shutdown_function(function () {
+    PubSubTestCase::tearDownFixtures();
+});
diff --git a/tests/ArrayTraitTest.php b/tests/unit/ArrayTraitTest.php
similarity index 100%
rename from tests/ArrayTraitTest.php
rename to tests/unit/ArrayTraitTest.php
diff --git a/tests/BigQuery/BigQueryClientTest.php b/tests/unit/BigQuery/BigQueryClientTest.php
similarity index 100%
rename from tests/BigQuery/BigQueryClientTest.php
rename to tests/unit/BigQuery/BigQueryClientTest.php
diff --git a/tests/BigQuery/Connection/RestTest.php b/tests/unit/BigQuery/Connection/RestTest.php
similarity index 100%
rename from tests/BigQuery/Connection/RestTest.php
rename to tests/unit/BigQuery/Connection/RestTest.php
diff --git a/tests/BigQuery/DatasetTest.php b/tests/unit/BigQuery/DatasetTest.php
similarity index 100%
rename from tests/BigQuery/DatasetTest.php
rename to tests/unit/BigQuery/DatasetTest.php
diff --git a/tests/BigQuery/InsertResponseTest.php b/tests/unit/BigQuery/InsertResponseTest.php
similarity index 100%
rename from tests/BigQuery/InsertResponseTest.php
rename to tests/unit/BigQuery/InsertResponseTest.php
diff --git a/tests/BigQuery/JobTest.php b/tests/unit/BigQuery/JobTest.php
similarity index 100%
rename from tests/BigQuery/JobTest.php
rename to tests/unit/BigQuery/JobTest.php
diff --git a/tests/BigQuery/QueryResultsTest.php b/tests/unit/BigQuery/QueryResultsTest.php
similarity index 100%
rename from tests/BigQuery/QueryResultsTest.php
rename to tests/unit/BigQuery/QueryResultsTest.php
diff --git a/tests/BigQuery/TableTest.php b/tests/unit/BigQuery/TableTest.php
similarity index 100%
rename from tests/BigQuery/TableTest.php
rename to tests/unit/BigQuery/TableTest.php
diff --git a/tests/CallTraitTest.php b/tests/unit/CallTraitTest.php
similarity index 100%
rename from tests/CallTraitTest.php
rename to tests/unit/CallTraitTest.php
diff --git a/tests/ClientTraitTest.php b/tests/unit/ClientTraitTest.php
similarity index 100%
rename from tests/ClientTraitTest.php
rename to tests/unit/ClientTraitTest.php
diff --git a/tests/Compute/MetadataTest.php b/tests/unit/Compute/MetadataTest.php
similarity index 100%
rename from tests/Compute/MetadataTest.php
rename to tests/unit/Compute/MetadataTest.php
diff --git a/tests/Datastore/BlobTest.php b/tests/unit/Datastore/BlobTest.php
similarity index 100%
rename from tests/Datastore/BlobTest.php
rename to tests/unit/Datastore/BlobTest.php
diff --git a/tests/Datastore/Connection/RestTest.php b/tests/unit/Datastore/Connection/RestTest.php
similarity index 100%
rename from tests/Datastore/Connection/RestTest.php
rename to tests/unit/Datastore/Connection/RestTest.php
diff --git a/tests/Datastore/DatastoreClientTest.php b/tests/unit/Datastore/DatastoreClientTest.php
similarity index 100%
rename from tests/Datastore/DatastoreClientTest.php
rename to tests/unit/Datastore/DatastoreClientTest.php
diff --git a/tests/Datastore/DatastoreSessionHandlerTest.php b/tests/unit/Datastore/DatastoreSessionHandlerTest.php
similarity index 100%
rename from tests/Datastore/DatastoreSessionHandlerTest.php
rename to tests/unit/Datastore/DatastoreSessionHandlerTest.php
diff --git a/tests/Datastore/DatastoreTraitTest.php b/tests/unit/Datastore/DatastoreTraitTest.php
similarity index 100%
rename from tests/Datastore/DatastoreTraitTest.php
rename to tests/unit/Datastore/DatastoreTraitTest.php
diff --git a/tests/Datastore/EntityMapperTest.php b/tests/unit/Datastore/EntityMapperTest.php
similarity index 100%
rename from tests/Datastore/EntityMapperTest.php
rename to tests/unit/Datastore/EntityMapperTest.php
diff --git a/tests/Datastore/EntityTest.php b/tests/unit/Datastore/EntityTest.php
similarity index 100%
rename from tests/Datastore/EntityTest.php
rename to tests/unit/Datastore/EntityTest.php
diff --git a/tests/Datastore/GeoPointTest.php b/tests/unit/Datastore/GeoPointTest.php
similarity index 100%
rename from tests/Datastore/GeoPointTest.php
rename to tests/unit/Datastore/GeoPointTest.php
diff --git a/tests/Datastore/KeyTest.php b/tests/unit/Datastore/KeyTest.php
similarity index 100%
rename from tests/Datastore/KeyTest.php
rename to tests/unit/Datastore/KeyTest.php
diff --git a/tests/Datastore/OperationTest.php b/tests/unit/Datastore/OperationTest.php
similarity index 100%
rename from tests/Datastore/OperationTest.php
rename to tests/unit/Datastore/OperationTest.php
diff --git a/tests/Datastore/Query/GqlQueryTest.php b/tests/unit/Datastore/Query/GqlQueryTest.php
similarity index 100%
rename from tests/Datastore/Query/GqlQueryTest.php
rename to tests/unit/Datastore/Query/GqlQueryTest.php
diff --git a/tests/Datastore/Query/QueryTest.php b/tests/unit/Datastore/Query/QueryTest.php
similarity index 100%
rename from tests/Datastore/Query/QueryTest.php
rename to tests/unit/Datastore/Query/QueryTest.php
diff --git a/tests/Datastore/TransactionTest.php b/tests/unit/Datastore/TransactionTest.php
similarity index 100%
rename from tests/Datastore/TransactionTest.php
rename to tests/unit/Datastore/TransactionTest.php
diff --git a/tests/EmulatorTraitTest.php b/tests/unit/EmulatorTraitTest.php
similarity index 100%
rename from tests/EmulatorTraitTest.php
rename to tests/unit/EmulatorTraitTest.php
diff --git a/tests/Exception/ServiceExceptionTest.php b/tests/unit/Exception/ServiceExceptionTest.php
similarity index 100%
rename from tests/Exception/ServiceExceptionTest.php
rename to tests/unit/Exception/ServiceExceptionTest.php
diff --git a/tests/ExponentialBackoffTest.php b/tests/unit/ExponentialBackoffTest.php
similarity index 100%
rename from tests/ExponentialBackoffTest.php
rename to tests/unit/ExponentialBackoffTest.php
diff --git a/tests/GrpcRequestWrapperTest.php b/tests/unit/GrpcRequestWrapperTest.php
similarity index 100%
rename from tests/GrpcRequestWrapperTest.php
rename to tests/unit/GrpcRequestWrapperTest.php
diff --git a/tests/GrpcTraitTest.php b/tests/unit/GrpcTraitTest.php
similarity index 100%
rename from tests/GrpcTraitTest.php
rename to tests/unit/GrpcTraitTest.php
diff --git a/tests/Iam/IamTest.php b/tests/unit/Iam/IamTest.php
similarity index 100%
rename from tests/Iam/IamTest.php
rename to tests/unit/Iam/IamTest.php
diff --git a/tests/Iam/PolicyBuilderTest.php b/tests/unit/Iam/PolicyBuilderTest.php
similarity index 100%
rename from tests/Iam/PolicyBuilderTest.php
rename to tests/unit/Iam/PolicyBuilderTest.php
diff --git a/tests/JsonFileTest.php b/tests/unit/JsonFileTest.php
similarity index 91%
rename from tests/JsonFileTest.php
rename to tests/unit/JsonFileTest.php
index 16478abb684c..9dea101b3c6f 100644
--- a/tests/JsonFileTest.php
+++ b/tests/unit/JsonFileTest.php
@@ -29,7 +29,7 @@ class JsonFileTest extends \PHPUnit_Framework_TestCase
 
     public function testComposer()
     {
-        $file = file_get_contents(__DIR__ .'/../composer.json');
+        $file = file_get_contents(__DIR__ .'/../../composer.json');
         $json = json_decode($file);
         $this->assertEquals(JSON_ERROR_NONE, json_last_error());
 
@@ -46,7 +46,7 @@ public function testComposer()
 
     public function testManifest()
     {
-        $file = file_get_contents(__DIR__ .'/../docs/manifest.json');
+        $file = file_get_contents(__DIR__ .'/../../docs/manifest.json');
         $json = json_decode($file);
         $this->assertEquals(JSON_ERROR_NONE, json_last_error());
 
@@ -63,7 +63,7 @@ public function testManifest()
 
     public function testToc()
     {
-        $file = file_get_contents(__DIR__ .'/../docs/toc.json');
+        $file = file_get_contents(__DIR__ .'/../../docs/toc.json');
         $json = json_decode($file);
         $this->assertEquals(JSON_ERROR_NONE, json_last_error());
 
diff --git a/tests/Logger/AppEngineFlexHandlerTest.php b/tests/unit/Logger/AppEngineFlexHandlerTest.php
similarity index 100%
rename from tests/Logger/AppEngineFlexHandlerTest.php
rename to tests/unit/Logger/AppEngineFlexHandlerTest.php
diff --git a/tests/Logging/Connection/GrpcTest.php b/tests/unit/Logging/Connection/GrpcTest.php
similarity index 100%
rename from tests/Logging/Connection/GrpcTest.php
rename to tests/unit/Logging/Connection/GrpcTest.php
diff --git a/tests/Logging/Connection/RestTest.php b/tests/unit/Logging/Connection/RestTest.php
similarity index 100%
rename from tests/Logging/Connection/RestTest.php
rename to tests/unit/Logging/Connection/RestTest.php
diff --git a/tests/Logging/LoggerTest.php b/tests/unit/Logging/LoggerTest.php
similarity index 100%
rename from tests/Logging/LoggerTest.php
rename to tests/unit/Logging/LoggerTest.php
diff --git a/tests/Logging/LoggingClientTest.php b/tests/unit/Logging/LoggingClientTest.php
similarity index 100%
rename from tests/Logging/LoggingClientTest.php
rename to tests/unit/Logging/LoggingClientTest.php
diff --git a/tests/Logging/MetricTest.php b/tests/unit/Logging/MetricTest.php
similarity index 100%
rename from tests/Logging/MetricTest.php
rename to tests/unit/Logging/MetricTest.php
diff --git a/tests/Logging/PsrLoggerTest.php b/tests/unit/Logging/PsrLoggerTest.php
similarity index 100%
rename from tests/Logging/PsrLoggerTest.php
rename to tests/unit/Logging/PsrLoggerTest.php
diff --git a/tests/Logging/SinkTest.php b/tests/unit/Logging/SinkTest.php
similarity index 100%
rename from tests/Logging/SinkTest.php
rename to tests/unit/Logging/SinkTest.php
diff --git a/tests/NaturalLanguage/AnnotationTest.php b/tests/unit/NaturalLanguage/AnnotationTest.php
similarity index 100%
rename from tests/NaturalLanguage/AnnotationTest.php
rename to tests/unit/NaturalLanguage/AnnotationTest.php
diff --git a/tests/NaturalLanguage/Connection/RestTest.php b/tests/unit/NaturalLanguage/Connection/RestTest.php
similarity index 100%
rename from tests/NaturalLanguage/Connection/RestTest.php
rename to tests/unit/NaturalLanguage/Connection/RestTest.php
diff --git a/tests/NaturalLanguage/NaturalLanguageClientTest.php b/tests/unit/NaturalLanguage/NaturalLanguageClientTest.php
similarity index 100%
rename from tests/NaturalLanguage/NaturalLanguageClientTest.php
rename to tests/unit/NaturalLanguage/NaturalLanguageClientTest.php
diff --git a/tests/PhpArrayTest.php b/tests/unit/PhpArrayTest.php
similarity index 100%
rename from tests/PhpArrayTest.php
rename to tests/unit/PhpArrayTest.php
diff --git a/tests/PubSub/Connection/GrpcTest.php b/tests/unit/PubSub/Connection/GrpcTest.php
similarity index 100%
rename from tests/PubSub/Connection/GrpcTest.php
rename to tests/unit/PubSub/Connection/GrpcTest.php
diff --git a/tests/PubSub/Connection/IamSubscriptionTest.php b/tests/unit/PubSub/Connection/IamSubscriptionTest.php
similarity index 100%
rename from tests/PubSub/Connection/IamSubscriptionTest.php
rename to tests/unit/PubSub/Connection/IamSubscriptionTest.php
diff --git a/tests/PubSub/Connection/IamTopicTest.php b/tests/unit/PubSub/Connection/IamTopicTest.php
similarity index 100%
rename from tests/PubSub/Connection/IamTopicTest.php
rename to tests/unit/PubSub/Connection/IamTopicTest.php
diff --git a/tests/PubSub/Connection/RestTest.php b/tests/unit/PubSub/Connection/RestTest.php
similarity index 100%
rename from tests/PubSub/Connection/RestTest.php
rename to tests/unit/PubSub/Connection/RestTest.php
diff --git a/tests/PubSub/IncomingMessageTraitTest.php b/tests/unit/PubSub/IncomingMessageTraitTest.php
similarity index 100%
rename from tests/PubSub/IncomingMessageTraitTest.php
rename to tests/unit/PubSub/IncomingMessageTraitTest.php
diff --git a/tests/PubSub/MessageTest.php b/tests/unit/PubSub/MessageTest.php
similarity index 100%
rename from tests/PubSub/MessageTest.php
rename to tests/unit/PubSub/MessageTest.php
diff --git a/tests/PubSub/PubSubClientTest.php b/tests/unit/PubSub/PubSubClientTest.php
similarity index 100%
rename from tests/PubSub/PubSubClientTest.php
rename to tests/unit/PubSub/PubSubClientTest.php
diff --git a/tests/PubSub/ResourceNameTraitTest.php b/tests/unit/PubSub/ResourceNameTraitTest.php
similarity index 100%
rename from tests/PubSub/ResourceNameTraitTest.php
rename to tests/unit/PubSub/ResourceNameTraitTest.php
diff --git a/tests/PubSub/SubscriptionTest.php b/tests/unit/PubSub/SubscriptionTest.php
similarity index 100%
rename from tests/PubSub/SubscriptionTest.php
rename to tests/unit/PubSub/SubscriptionTest.php
diff --git a/tests/PubSub/TopicTest.php b/tests/unit/PubSub/TopicTest.php
similarity index 100%
rename from tests/PubSub/TopicTest.php
rename to tests/unit/PubSub/TopicTest.php
diff --git a/tests/RequestBuilderTest.php b/tests/unit/RequestBuilderTest.php
similarity index 100%
rename from tests/RequestBuilderTest.php
rename to tests/unit/RequestBuilderTest.php
diff --git a/tests/RequestWrapperTest.php b/tests/unit/RequestWrapperTest.php
similarity index 100%
rename from tests/RequestWrapperTest.php
rename to tests/unit/RequestWrapperTest.php
diff --git a/tests/RestTraitTest.php b/tests/unit/RestTraitTest.php
similarity index 100%
rename from tests/RestTraitTest.php
rename to tests/unit/RestTraitTest.php
diff --git a/tests/ServiceBuilderTest.php b/tests/unit/ServiceBuilderTest.php
similarity index 100%
rename from tests/ServiceBuilderTest.php
rename to tests/unit/ServiceBuilderTest.php
diff --git a/tests/Speech/Connection/RestTest.php b/tests/unit/Speech/Connection/RestTest.php
similarity index 100%
rename from tests/Speech/Connection/RestTest.php
rename to tests/unit/Speech/Connection/RestTest.php
diff --git a/tests/Speech/OperationTest.php b/tests/unit/Speech/OperationTest.php
similarity index 100%
rename from tests/Speech/OperationTest.php
rename to tests/unit/Speech/OperationTest.php
diff --git a/tests/Speech/SpeechClientTest.php b/tests/unit/Speech/SpeechClientTest.php
similarity index 100%
rename from tests/Speech/SpeechClientTest.php
rename to tests/unit/Speech/SpeechClientTest.php
diff --git a/tests/Storage/AclTest.php b/tests/unit/Storage/AclTest.php
similarity index 100%
rename from tests/Storage/AclTest.php
rename to tests/unit/Storage/AclTest.php
diff --git a/tests/Storage/BucketTest.php b/tests/unit/Storage/BucketTest.php
similarity index 100%
rename from tests/Storage/BucketTest.php
rename to tests/unit/Storage/BucketTest.php
diff --git a/tests/Storage/Connection/RestTest.php b/tests/unit/Storage/Connection/RestTest.php
similarity index 100%
rename from tests/Storage/Connection/RestTest.php
rename to tests/unit/Storage/Connection/RestTest.php
diff --git a/tests/Storage/EncryptionTraitTest.php b/tests/unit/Storage/EncryptionTraitTest.php
similarity index 100%
rename from tests/Storage/EncryptionTraitTest.php
rename to tests/unit/Storage/EncryptionTraitTest.php
diff --git a/tests/Storage/StorageClientTest.php b/tests/unit/Storage/StorageClientTest.php
similarity index 100%
rename from tests/Storage/StorageClientTest.php
rename to tests/unit/Storage/StorageClientTest.php
diff --git a/tests/Storage/StorageObjectTest.php b/tests/unit/Storage/StorageObjectTest.php
similarity index 100%
rename from tests/Storage/StorageObjectTest.php
rename to tests/unit/Storage/StorageObjectTest.php
diff --git a/tests/Translate/Connection/RestTest.php b/tests/unit/Translate/Connection/RestTest.php
similarity index 100%
rename from tests/Translate/Connection/RestTest.php
rename to tests/unit/Translate/Connection/RestTest.php
diff --git a/tests/Translate/TranslateClientTest.php b/tests/unit/Translate/TranslateClientTest.php
similarity index 100%
rename from tests/Translate/TranslateClientTest.php
rename to tests/unit/Translate/TranslateClientTest.php
diff --git a/tests/Upload/MultipartUploaderTest.php b/tests/unit/Upload/MultipartUploaderTest.php
similarity index 100%
rename from tests/Upload/MultipartUploaderTest.php
rename to tests/unit/Upload/MultipartUploaderTest.php
diff --git a/tests/Upload/ResumableUploaderTest.php b/tests/unit/Upload/ResumableUploaderTest.php
similarity index 100%
rename from tests/Upload/ResumableUploaderTest.php
rename to tests/unit/Upload/ResumableUploaderTest.php
diff --git a/tests/UriTraitTest.php b/tests/unit/UriTraitTest.php
similarity index 100%
rename from tests/UriTraitTest.php
rename to tests/unit/UriTraitTest.php
diff --git a/tests/ValidateTraitTest.php b/tests/unit/ValidateTraitTest.php
similarity index 100%
rename from tests/ValidateTraitTest.php
rename to tests/unit/ValidateTraitTest.php
diff --git a/tests/Vision/Annotation/EntityTest.php b/tests/unit/Vision/Annotation/EntityTest.php
similarity index 100%
rename from tests/Vision/Annotation/EntityTest.php
rename to tests/unit/Vision/Annotation/EntityTest.php
diff --git a/tests/Vision/Annotation/Face/LandmarksTest.php b/tests/unit/Vision/Annotation/Face/LandmarksTest.php
similarity index 100%
rename from tests/Vision/Annotation/Face/LandmarksTest.php
rename to tests/unit/Vision/Annotation/Face/LandmarksTest.php
diff --git a/tests/Vision/Annotation/FaceTest.php b/tests/unit/Vision/Annotation/FaceTest.php
similarity index 100%
rename from tests/Vision/Annotation/FaceTest.php
rename to tests/unit/Vision/Annotation/FaceTest.php
diff --git a/tests/Vision/Annotation/LikelihoodTraitTest.php b/tests/unit/Vision/Annotation/LikelihoodTraitTest.php
similarity index 100%
rename from tests/Vision/Annotation/LikelihoodTraitTest.php
rename to tests/unit/Vision/Annotation/LikelihoodTraitTest.php
diff --git a/tests/Vision/Annotation/SafeSearchTest.php b/tests/unit/Vision/Annotation/SafeSearchTest.php
similarity index 100%
rename from tests/Vision/Annotation/SafeSearchTest.php
rename to tests/unit/Vision/Annotation/SafeSearchTest.php
diff --git a/tests/Vision/AnnotationTest.php b/tests/unit/Vision/AnnotationTest.php
similarity index 100%
rename from tests/Vision/AnnotationTest.php
rename to tests/unit/Vision/AnnotationTest.php
diff --git a/tests/Vision/Connection/RestTest.php b/tests/unit/Vision/Connection/RestTest.php
similarity index 100%
rename from tests/Vision/Connection/RestTest.php
rename to tests/unit/Vision/Connection/RestTest.php
diff --git a/tests/Vision/ImageTest.php b/tests/unit/Vision/ImageTest.php
similarity index 100%
rename from tests/Vision/ImageTest.php
rename to tests/unit/Vision/ImageTest.php
diff --git a/tests/Vision/VisionClientTest.php b/tests/unit/Vision/VisionClientTest.php
similarity index 100%
rename from tests/Vision/VisionClientTest.php
rename to tests/unit/Vision/VisionClientTest.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
new file mode 100644
index 000000000000..19d4b20353dd
--- /dev/null
+++ b/tests/unit/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require __DIR__ . '/../../vendor/autoload.php';
diff --git a/tests/data/brooklyn.flac b/tests/unit/data/brooklyn.flac
similarity index 100%
rename from tests/data/brooklyn.flac
rename to tests/unit/data/brooklyn.flac
diff --git a/tests/data/logo.svg b/tests/unit/data/logo.svg
similarity index 100%
rename from tests/data/logo.svg
rename to tests/unit/data/logo.svg
diff --git a/tests/fixtures/datastore/entity-batch-lookup.json b/tests/unit/fixtures/datastore/entity-batch-lookup.json
similarity index 100%
rename from tests/fixtures/datastore/entity-batch-lookup.json
rename to tests/unit/fixtures/datastore/entity-batch-lookup.json
diff --git a/tests/fixtures/datastore/entity-lookup-bigsort.json b/tests/unit/fixtures/datastore/entity-lookup-bigsort.json
similarity index 100%
rename from tests/fixtures/datastore/entity-lookup-bigsort.json
rename to tests/unit/fixtures/datastore/entity-lookup-bigsort.json
diff --git a/tests/fixtures/datastore/entity-result-no-properties.json b/tests/unit/fixtures/datastore/entity-result-no-properties.json
similarity index 100%
rename from tests/fixtures/datastore/entity-result-no-properties.json
rename to tests/unit/fixtures/datastore/entity-result-no-properties.json
diff --git a/tests/fixtures/datastore/entity-result.json b/tests/unit/fixtures/datastore/entity-result.json
similarity index 100%
rename from tests/fixtures/datastore/entity-result.json
rename to tests/unit/fixtures/datastore/entity-result.json
diff --git a/tests/fixtures/datastore/query-results.json b/tests/unit/fixtures/datastore/query-results.json
similarity index 100%
rename from tests/fixtures/datastore/query-results.json
rename to tests/unit/fixtures/datastore/query-results.json
diff --git a/tests/fixtures/json-key-fixture.json b/tests/unit/fixtures/json-key-fixture.json
similarity index 100%
rename from tests/fixtures/json-key-fixture.json
rename to tests/unit/fixtures/json-key-fixture.json
diff --git a/tests/fixtures/schema/composer.json.schema b/tests/unit/fixtures/schema/composer.json.schema
similarity index 100%
rename from tests/fixtures/schema/composer.json.schema
rename to tests/unit/fixtures/schema/composer.json.schema
diff --git a/tests/fixtures/schema/manifest.json.schema b/tests/unit/fixtures/schema/manifest.json.schema
similarity index 100%
rename from tests/fixtures/schema/manifest.json.schema
rename to tests/unit/fixtures/schema/manifest.json.schema
diff --git a/tests/fixtures/schema/toc.json.schema b/tests/unit/fixtures/schema/toc.json.schema
similarity index 100%
rename from tests/fixtures/schema/toc.json.schema
rename to tests/unit/fixtures/schema/toc.json.schema
diff --git a/tests/fixtures/service-fixture.json b/tests/unit/fixtures/service-fixture.json
similarity index 100%
rename from tests/fixtures/service-fixture.json
rename to tests/unit/fixtures/service-fixture.json
diff --git a/tests/fixtures/vision/eiffel-tower.jpg b/tests/unit/fixtures/vision/eiffel-tower.jpg
similarity index 100%
rename from tests/fixtures/vision/eiffel-tower.jpg
rename to tests/unit/fixtures/vision/eiffel-tower.jpg
diff --git a/tests/fixtures/vision/face-landmarks.json b/tests/unit/fixtures/vision/face-landmarks.json
similarity index 100%
rename from tests/fixtures/vision/face-landmarks.json
rename to tests/unit/fixtures/vision/face-landmarks.json