diff --git a/appengine/flexible/analytics/phpunit.xml b/appengine/flexible/analytics/phpunit.xml
deleted file mode 100644
index 473db3ea55..0000000000
--- a/appengine/flexible/analytics/phpunit.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <php>
-    <env name="GA_TRACKING_ID" value="UA-78971600-1"/>
-  </php>
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-  <logging>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-  </logging>
-  <filter>
-    <whitelist>
-      <file>app.php</file>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/appengine/flexible/analytics/phpunit.xml.dist b/appengine/flexible/analytics/phpunit.xml.dist
new file mode 100644
index 0000000000..87337d659f
--- /dev/null
+++ b/appengine/flexible/analytics/phpunit.xml.dist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <php>
+        <env name="GA_TRACKING_ID" value="UA-78971600-1"/>
+    </php>
+    <testsuites>
+        <testsuite>
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+    <filter>
+        <whitelist>
+            <file>app.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/appengine/flexible/analytics/test/bootstrap.php b/appengine/flexible/analytics/test/bootstrap.php
deleted file mode 100644
index 855a955f73..0000000000
--- a/appengine/flexible/analytics/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/flexible/cloudsql/phpunit.xml b/appengine/flexible/cloudsql/phpunit.xml
deleted file mode 100644
index 9331afbbba..0000000000
--- a/appengine/flexible/cloudsql/phpunit.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-  <logging>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-  </logging>
-  <filter>
-    <whitelist>
-      <file>app.php</file>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/appengine/flexible/cloudsql/phpunit.xml.dist b/appengine/flexible/cloudsql/phpunit.xml.dist
new file mode 100644
index 0000000000..8b8325e7b6
--- /dev/null
+++ b/appengine/flexible/cloudsql/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
+    <testsuites>
+        <testsuite>
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+    <filter>
+        <whitelist>
+            <file>app.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/appengine/flexible/datastore/phpunit.xml b/appengine/flexible/datastore/phpunit.xml
deleted file mode 100644
index 9331afbbba..0000000000
--- a/appengine/flexible/datastore/phpunit.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-  <logging>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-  </logging>
-  <filter>
-    <whitelist>
-      <file>app.php</file>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/appengine/flexible/datastore/phpunit.xml.dist b/appengine/flexible/datastore/phpunit.xml.dist
new file mode 100644
index 0000000000..a12afbd470
--- /dev/null
+++ b/appengine/flexible/datastore/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite>
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+    <filter>
+        <whitelist>
+            <file>app.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/appengine/flexible/datastore/test/bootstrap.php b/appengine/flexible/datastore/test/bootstrap.php
deleted file mode 100644
index 855a955f73..0000000000
--- a/appengine/flexible/datastore/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/flexible/drupal8/phpunit.xml b/appengine/flexible/drupal8/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/drupal8/phpunit.xml
rename to appengine/flexible/drupal8/phpunit.xml.dist
diff --git a/appengine/flexible/laravel/phpunit.xml b/appengine/flexible/laravel/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/laravel/phpunit.xml
rename to appengine/flexible/laravel/phpunit.xml.dist
diff --git a/appengine/flexible/logging/phpunit.xml b/appengine/flexible/logging/phpunit.xml.dist
similarity index 95%
rename from appengine/flexible/logging/phpunit.xml
rename to appengine/flexible/logging/phpunit.xml.dist
index be9ce48a4b..7ce814b9b9 100644
--- a/appengine/flexible/logging/phpunit.xml
+++ b/appengine/flexible/logging/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="AppEngine Flex logging test">
             <directory>test</directory>
diff --git a/appengine/flexible/logging/test/bootstrap.php b/appengine/flexible/logging/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/appengine/flexible/logging/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/flexible/mailgun/phpunit.xml b/appengine/flexible/mailgun/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/mailgun/phpunit.xml
rename to appengine/flexible/mailgun/phpunit.xml.dist
diff --git a/appengine/flexible/mailjet/phpunit.xml b/appengine/flexible/mailjet/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/mailjet/phpunit.xml
rename to appengine/flexible/mailjet/phpunit.xml.dist
diff --git a/appengine/flexible/memcache/phpunit.xml b/appengine/flexible/memcache/phpunit.xml
deleted file mode 100644
index 9331afbbba..0000000000
--- a/appengine/flexible/memcache/phpunit.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-  <logging>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-  </logging>
-  <filter>
-    <whitelist>
-      <file>app.php</file>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/appengine/flexible/memcache/phpunit.xml.dist b/appengine/flexible/memcache/phpunit.xml.dist
new file mode 100644
index 0000000000..8b8325e7b6
--- /dev/null
+++ b/appengine/flexible/memcache/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
+    <testsuites>
+        <testsuite>
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+    <filter>
+        <whitelist>
+            <file>app.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/appengine/flexible/metadata/phpunit.xml b/appengine/flexible/metadata/phpunit.xml.dist
similarity index 95%
rename from appengine/flexible/metadata/phpunit.xml
rename to appengine/flexible/metadata/phpunit.xml.dist
index 60ef0662db..c8f0ab2f76 100644
--- a/appengine/flexible/metadata/phpunit.xml
+++ b/appengine/flexible/metadata/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="AppEngine Flex metadata test">
             <directory>test</directory>
diff --git a/appengine/flexible/metadata/test/bootstrap.php b/appengine/flexible/metadata/test/bootstrap.php
deleted file mode 100644
index f76545c73b..0000000000
--- a/appengine/flexible/metadata/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright 2017 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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/flexible/sendgrid/phpunit.xml b/appengine/flexible/sendgrid/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/sendgrid/phpunit.xml
rename to appengine/flexible/sendgrid/phpunit.xml.dist
diff --git a/appengine/flexible/staticcontent/phpunit.xml b/appengine/flexible/staticcontent/phpunit.xml
deleted file mode 100644
index d294b1f7af..0000000000
--- a/appengine/flexible/staticcontent/phpunit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>
diff --git a/appengine/flexible/staticcontent/phpunit.xml.dist b/appengine/flexible/staticcontent/phpunit.xml.dist
new file mode 100644
index 0000000000..1aee26a6f9
--- /dev/null
+++ b/appengine/flexible/staticcontent/phpunit.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="PHP static content test">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/appengine/flexible/staticcontent/test/bootstrap.php b/appengine/flexible/staticcontent/test/bootstrap.php
deleted file mode 100644
index 855a955f73..0000000000
--- a/appengine/flexible/staticcontent/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/flexible/storage/phpunit.xml b/appengine/flexible/storage/phpunit.xml
index d256d7d2ec..d487df10e0 100644
--- a/appengine/flexible/storage/phpunit.xml
+++ b/appengine/flexible/storage/phpunit.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="AppEngine Flex storage test">
             <directory>test</directory>
diff --git a/appengine/flexible/storage/test/bootstrap.php b/appengine/flexible/storage/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/appengine/flexible/storage/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/flexible/symfony/phpunit.xml b/appengine/flexible/symfony/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/symfony/phpunit.xml
rename to appengine/flexible/symfony/phpunit.xml.dist
diff --git a/appengine/flexible/twilio/phpunit.xml b/appengine/flexible/twilio/phpunit.xml.dist
similarity index 100%
rename from appengine/flexible/twilio/phpunit.xml
rename to appengine/flexible/twilio/phpunit.xml.dist
diff --git a/appengine/standard/cloudsql/phpunit.xml b/appengine/standard/cloudsql/phpunit.xml.dist
similarity index 95%
rename from appengine/standard/cloudsql/phpunit.xml
rename to appengine/standard/cloudsql/phpunit.xml.dist
index 347d9494cd..4375ab7251 100644
--- a/appengine/standard/cloudsql/phpunit.xml
+++ b/appengine/standard/cloudsql/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP cloudsql test">
             <directory>test</directory>
diff --git a/appengine/standard/cloudsql/test/bootstrap.php b/appengine/standard/cloudsql/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/appengine/standard/cloudsql/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/standard/http/phpunit.xml b/appengine/standard/http/phpunit.xml.dist
similarity index 95%
rename from appengine/standard/http/phpunit.xml
rename to appengine/standard/http/phpunit.xml.dist
index f99aeee5ec..f5c6be92f0 100644
--- a/appengine/standard/http/phpunit.xml
+++ b/appengine/standard/http/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="AppEngine http test">
             <directory>test</directory>
diff --git a/appengine/standard/http/test/bootstrap.php b/appengine/standard/http/test/bootstrap.php
deleted file mode 100644
index 823a5ebe55..0000000000
--- a/appengine/standard/http/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
- */
-
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/standard/logging/phpunit.xml b/appengine/standard/logging/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/logging/phpunit.xml
rename to appengine/standard/logging/phpunit.xml.dist
diff --git a/appengine/standard/mail/phpunit.xml b/appengine/standard/mail/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/mail/phpunit.xml
rename to appengine/standard/mail/phpunit.xml.dist
diff --git a/appengine/standard/mailgun/phpunit.xml b/appengine/standard/mailgun/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/mailgun/phpunit.xml
rename to appengine/standard/mailgun/phpunit.xml.dist
diff --git a/appengine/standard/mailjet/phpunit.xml b/appengine/standard/mailjet/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/mailjet/phpunit.xml
rename to appengine/standard/mailjet/phpunit.xml.dist
diff --git a/appengine/standard/memcache/phpunit.xml.dist b/appengine/standard/memcache/phpunit.xml.dist
index d294b1f7af..726c8f3807 100644
--- a/appengine/standard/memcache/phpunit.xml.dist
+++ b/appengine/standard/memcache/phpunit.xml.dist
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
+<!--
+  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.
+-->
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="PHP memcache test">
+            <directory>test</directory>
+        </testsuite>
   </testsuites>
 </phpunit>
diff --git a/appengine/standard/memcache/test/bootstrap.php b/appengine/standard/memcache/test/bootstrap.php
deleted file mode 100644
index 855a955f73..0000000000
--- a/appengine/standard/memcache/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/standard/modules/phpunit.xml b/appengine/standard/modules/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/modules/phpunit.xml
rename to appengine/standard/modules/phpunit.xml.dist
diff --git a/appengine/standard/phpmyadmin/phpunit.xml.dist b/appengine/standard/phpmyadmin/phpunit.xml.dist
index d294b1f7af..dd72973923 100644
--- a/appengine/standard/phpmyadmin/phpunit.xml.dist
+++ b/appengine/standard/phpmyadmin/phpunit.xml.dist
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
+<!--
+  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.
+-->
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="PHP phpMyAdmin test">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/appengine/standard/phpmyadmin/test/bootstrap.php b/appengine/standard/phpmyadmin/test/bootstrap.php
deleted file mode 100644
index 855a955f73..0000000000
--- a/appengine/standard/phpmyadmin/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/standard/storage/phpunit.xml b/appengine/standard/storage/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/storage/phpunit.xml
rename to appengine/standard/storage/phpunit.xml.dist
diff --git a/appengine/standard/taskqueue/phpunit.xml b/appengine/standard/taskqueue/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/taskqueue/phpunit.xml
rename to appengine/standard/taskqueue/phpunit.xml.dist
diff --git a/appengine/standard/twilio/phpunit.xml b/appengine/standard/twilio/phpunit.xml.dist
similarity index 95%
rename from appengine/standard/twilio/phpunit.xml
rename to appengine/standard/twilio/phpunit.xml.dist
index 132fc7740d..0d63149911 100644
--- a/appengine/standard/twilio/phpunit.xml
+++ b/appengine/standard/twilio/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP twilio test">
             <directory>test</directory>
diff --git a/appengine/standard/twilio/test/bootstrap.php b/appengine/standard/twilio/test/bootstrap.php
deleted file mode 100644
index 823a5ebe55..0000000000
--- a/appengine/standard/twilio/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
- */
-
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appengine/standard/users/phpunit.xml b/appengine/standard/users/phpunit.xml.dist
similarity index 100%
rename from appengine/standard/users/phpunit.xml
rename to appengine/standard/users/phpunit.xml.dist
diff --git a/appengine/wordpress/phpunit.xml b/appengine/wordpress/phpunit.xml
deleted file mode 100644
index d294b1f7af..0000000000
--- a/appengine/wordpress/phpunit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>
diff --git a/appengine/wordpress/phpunit.xml.dist b/appengine/wordpress/phpunit.xml.dist
new file mode 100644
index 0000000000..fdecd3cea3
--- /dev/null
+++ b/appengine/wordpress/phpunit.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite>
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/appengine/wordpress/test/bootstrap.php b/appengine/wordpress/test/bootstrap.php
deleted file mode 100644
index 855a955f73..0000000000
--- a/appengine/wordpress/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/bigquery/api/phpunit.xml.dist b/bigquery/api/phpunit.xml.dist
index 328d9340c3..3587a066b4 100644
--- a/bigquery/api/phpunit.xml.dist
+++ b/bigquery/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP bigquery test">
             <directory>test</directory>
diff --git a/bigquery/api/test/bootstrap.php b/bigquery/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/bigquery/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/bigquery/quickstart/phpunit.xml.dist b/bigquery/quickstart/phpunit.xml.dist
index 4cb0382a76..9f1bd58a98 100644
--- a/bigquery/quickstart/phpunit.xml.dist
+++ b/bigquery/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google BigQuery Quickstart Tests">
             <directory>test</directory>
diff --git a/bigquery/quickstart/test/bootstrap.php b/bigquery/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/bigquery/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/bigquery/shakespeare/phpunit.xml.dist b/bigquery/shakespeare/phpunit.xml.dist
index 658fedec8b..353f21ef6f 100644
--- a/bigquery/shakespeare/phpunit.xml.dist
+++ b/bigquery/shakespeare/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP BigQuery Shakespeare test">
             <directory>test</directory>
diff --git a/bigquery/shakespeare/test/bootstrap.php b/bigquery/shakespeare/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/bigquery/shakespeare/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/compute/logging/phpunit.xml b/compute/logging/phpunit.xml.dist
similarity index 100%
rename from compute/logging/phpunit.xml
rename to compute/logging/phpunit.xml.dist
diff --git a/datastore/api/phpunit.xml.dist b/datastore/api/phpunit.xml.dist
index 2e178366d7..3b9f8ea7bf 100644
--- a/datastore/api/phpunit.xml.dist
+++ b/datastore/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Datastore Cloud library Tests">
             <directory>test</directory>
diff --git a/datastore/api/test/bootstrap.php b/datastore/api/test/bootstrap.php
deleted file mode 100644
index 823a5ebe55..0000000000
--- a/datastore/api/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
- */
-
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/datastore/quickstart/phpunit.xml.dist b/datastore/quickstart/phpunit.xml.dist
index d8fd1e26a4..9053da920a 100644
--- a/datastore/quickstart/phpunit.xml.dist
+++ b/datastore/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Datastore Quickstart Tests">
             <directory>test</directory>
diff --git a/datastore/quickstart/test/bootstrap.php b/datastore/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/datastore/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/datastore/tutorial/phpunit.xml.dist b/datastore/tutorial/phpunit.xml.dist
index 796ac7c985..ca14a31ed1 100644
--- a/datastore/tutorial/phpunit.xml.dist
+++ b/datastore/tutorial/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Cloud Datastore tutorial application tests">
             <directory>test</directory>
diff --git a/datastore/tutorial/test/bootstrap.php b/datastore/tutorial/test/bootstrap.php
deleted file mode 100644
index 823a5ebe55..0000000000
--- a/datastore/tutorial/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
- */
-
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/endpoints/getting-started/phpunit.xml b/endpoints/getting-started/phpunit.xml.dist
similarity index 100%
rename from endpoints/getting-started/phpunit.xml
rename to endpoints/getting-started/phpunit.xml.dist
diff --git a/error_reporting/quickstart/phpunit.xml b/error_reporting/quickstart/phpunit.xml.dist
similarity index 95%
rename from error_reporting/quickstart/phpunit.xml
rename to error_reporting/quickstart/phpunit.xml.dist
index 67dd526485..26597a4897 100644
--- a/error_reporting/quickstart/phpunit.xml
+++ b/error_reporting/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Error Reporting Quickstart Tests">
             <directory>test</directory>
diff --git a/error_reporting/quickstart/test/bootstrap.php b/error_reporting/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/error_reporting/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/kms/api/phpunit.xml.dist b/kms/api/phpunit.xml.dist
index 54ac4039ed..8719a22188 100644
--- a/kms/api/phpunit.xml.dist
+++ b/kms/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Cloud KMS API Tests">
             <directory>test</directory>
diff --git a/kms/api/test/bootstrap.php b/kms/api/test/bootstrap.php
deleted file mode 100644
index f76545c73b..0000000000
--- a/kms/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright 2017 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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/kms/quickstart/phpunit.xml.dist b/kms/quickstart/phpunit.xml.dist
index 7923363f2e..466227d825 100644
--- a/kms/quickstart/phpunit.xml.dist
+++ b/kms/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Cloud KMS Quickstart Tests">
             <directory>test</directory>
diff --git a/kms/quickstart/test/bootstrap.php b/kms/quickstart/test/bootstrap.php
deleted file mode 100644
index f76545c73b..0000000000
--- a/kms/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright 2017 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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/language/api/phpunit.xml.dist b/language/api/phpunit.xml.dist
index 74ef8a0bd8..2fe9adb66b 100644
--- a/language/api/phpunit.xml.dist
+++ b/language/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP natural language test">
             <directory>test</directory>
diff --git a/language/api/test/bootstrap.php b/language/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/language/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/language/quickstart/phpunit.xml.dist b/language/quickstart/phpunit.xml.dist
index fc16fb68da..fb6ab29305 100644
--- a/language/quickstart/phpunit.xml.dist
+++ b/language/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Language Quickstart Tests">
             <directory>test</directory>
diff --git a/language/quickstart/test/bootstrap.php b/language/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/language/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/logging/api/phpunit.xml.dist b/logging/api/phpunit.xml.dist
index f12f10942b..2af2b09570 100644
--- a/logging/api/phpunit.xml.dist
+++ b/logging/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Stackdriver Logging Cloud library Tests">
             <directory>test</directory>
diff --git a/logging/api/test/bootstrap.php b/logging/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/logging/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/logging/quickstart/phpunit.xml.dist b/logging/quickstart/phpunit.xml.dist
index fd6299216c..95219ee94d 100644
--- a/logging/quickstart/phpunit.xml.dist
+++ b/logging/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Logging Quickstart Tests">
             <directory>test</directory>
diff --git a/logging/quickstart/test/bootstrap.php b/logging/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/logging/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/pubsub/api/phpunit.xml.dist b/pubsub/api/phpunit.xml.dist
index 50c9f0f402..46b976d9b6 100644
--- a/pubsub/api/phpunit.xml.dist
+++ b/pubsub/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP pubsub test">
             <directory>test</directory>
diff --git a/pubsub/api/test/bootstrap.php b/pubsub/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/pubsub/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/pubsub/quickstart/phpunit.xml.dist b/pubsub/quickstart/phpunit.xml.dist
index 6b7a8dde21..e051d0c180 100644
--- a/pubsub/quickstart/phpunit.xml.dist
+++ b/pubsub/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google PubSub Quickstart Tests">
             <directory>test</directory>
diff --git a/pubsub/quickstart/test/bootstrap.php b/pubsub/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/pubsub/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/spanner/phpunit.xml.dist b/spanner/phpunit.xml.dist
index 395715c8b4..75b20afe92 100644
--- a/spanner/phpunit.xml.dist
+++ b/spanner/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Spanner Tests">
             <directory>test</directory>
diff --git a/speech/api/phpunit.xml.dist b/speech/api/phpunit.xml.dist
index c4ba974120..fb86c39eb5 100644
--- a/speech/api/phpunit.xml.dist
+++ b/speech/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP speech test">
             <directory>test</directory>
diff --git a/speech/api/test/bootstrap.php b/speech/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/speech/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/speech/quickstart/phpunit.xml.dist b/speech/quickstart/phpunit.xml.dist
index f60f7eb980..fd958e3d45 100644
--- a/speech/quickstart/phpunit.xml.dist
+++ b/speech/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Speech Quickstart Tests">
             <directory>test</directory>
diff --git a/speech/quickstart/test/bootstrap.php b/speech/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/speech/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/storage/api/phpunit.xml.dist b/storage/api/phpunit.xml.dist
index 7b5a1195bf..73f61567e0 100644
--- a/storage/api/phpunit.xml.dist
+++ b/storage/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP storage test">
             <directory>test</directory>
diff --git a/storage/api/test/bootstrap.php b/storage/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/storage/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/storage/quickstart/phpunit.xml.dist b/storage/quickstart/phpunit.xml.dist
index fa95ce2d8d..33fa1a2234 100644
--- a/storage/quickstart/phpunit.xml.dist
+++ b/storage/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Storage Quickstart Tests">
             <directory>test</directory>
diff --git a/storage/quickstart/test/bootstrap.php b/storage/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/storage/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/translate/api/phpunit.xml.dist b/translate/api/phpunit.xml.dist
index e4c708b6f7..cfe34f2189 100644
--- a/translate/api/phpunit.xml.dist
+++ b/translate/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP translate test">
             <directory>test</directory>
diff --git a/translate/api/test/bootstrap.php b/translate/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/translate/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/translate/quickstart/phpunit.xml.dist b/translate/quickstart/phpunit.xml.dist
index 1b0c6343b5..1713e9be96 100644
--- a/translate/quickstart/phpunit.xml.dist
+++ b/translate/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Translate Quickstart Tests">
             <directory>test</directory>
diff --git a/translate/quickstart/test/bootstrap.php b/translate/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/translate/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/video/phpunit.xml.dist b/video/phpunit.xml.dist
index 9dd4e47460..7f51878e42 100644
--- a/video/phpunit.xml.dist
+++ b/video/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP Video Intelligence test">
             <directory>test</directory>
diff --git a/video/test/bootstrap.php b/video/test/bootstrap.php
deleted file mode 100644
index e0510dfcc1..0000000000
--- a/video/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/vision/api/phpunit.xml.dist b/vision/api/phpunit.xml.dist
index 0324b32655..0a90d3136a 100644
--- a/vision/api/phpunit.xml.dist
+++ b/vision/api/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="PHP vision test">
             <directory>test</directory>
diff --git a/vision/api/test/bootstrap.php b/vision/api/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/vision/api/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/vision/quickstart/phpunit.xml.dist b/vision/quickstart/phpunit.xml.dist
index cbec789b35..be5659cef9 100644
--- a/vision/quickstart/phpunit.xml.dist
+++ b/vision/quickstart/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite name="Google Vision Quickstart Tests">
             <directory>test</directory>
diff --git a/vision/quickstart/test/bootstrap.php b/vision/quickstart/test/bootstrap.php
deleted file mode 100644
index 864f1cd1b6..0000000000
--- a/vision/quickstart/test/bootstrap.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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.
- */
-require_once __DIR__ . '/../vendor/autoload.php';