diff --git a/composer.json b/composer.json
index 63b3ff75..a06baa89 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,9 @@
     "phpunit/phpunit": "^7.5|^8.0",
     "guzzlehttp/guzzle": "^7.2"
   },
+  "autoload-dev": {
+    "files": ["tests/common/types.php"]
+  },
   "bin": [
     "router.php"
   ]
diff --git a/tests/FunctionsFrameworkTest.php b/tests/FunctionsFrameworkTest.php
index 32489166..fffd890a 100644
--- a/tests/FunctionsFrameworkTest.php
+++ b/tests/FunctionsFrameworkTest.php
@@ -17,8 +17,6 @@
 
 namespace Google\CloudFunctions\Tests;
 
-require_once 'tests/common/types.php';
-
 use Google\CloudFunctions\FunctionsFramework;
 use Google\CloudFunctions\FunctionsFrameworkTesting;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/InvokerTest.php b/tests/InvokerTest.php
index 92af7d07..3f525ca3 100644
--- a/tests/InvokerTest.php
+++ b/tests/InvokerTest.php
@@ -18,8 +18,6 @@
 
 namespace Google\CloudFunctions\Tests;
 
-require_once 'tests/common/types.php';
-
 use CloudEvents\V1\CloudEventInterface;
 use Exception;
 use Google\CloudFunctions\CloudEvent;
diff --git a/tests/TypedFunctionWrapperTest.php b/tests/TypedFunctionWrapperTest.php
index 004ca30e..2ee125a7 100644
--- a/tests/TypedFunctionWrapperTest.php
+++ b/tests/TypedFunctionWrapperTest.php
@@ -18,8 +18,6 @@
 
 namespace Google\CloudFunctions\Tests;
 
-require_once 'tests/common/types.php';
-
 use Google\CloudFunctions\HttpFunctionWrapper;
 use Google\CloudFunctions\Tests\Common\BadType;
 use Google\CloudFunctions\Tests\Common\IntValue;