diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 7f161bd79..66be5eae8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -42,9 +42,14 @@ To achieve this, you need to acquire the Composer source code:
 3. Run Composer to get the dependencies: `cd composer && php ../composer.phar install`
 
 You can run the test suite by executing `vendor/bin/simple-phpunit` when inside the
-composer directory, and run Composer by executing the `bin/composer`. To test
-your modified Composer code against another project, run `php
-/path/to/composer/bin/composer` inside that project's directory.
+composer directory, and run Composer by executing the `bin/composer`.
+
+For running the tests against the most recent PHP versions (PHP 8.0/8.1), you will
+need to run `composer update --ignore-platform-reqs && git checkout composer.lock`  before running 
+the `vendor/bin/simple-phpunit` command.
+
+To test your modified Composer code against another project, run
+`php /path/to/composer/bin/composer` inside that project's directory.
 
 Contributing policy
 -------------------
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index cfb4b4d84..2b6e4bc12 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -12,7 +12,6 @@ env:
   COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
   COMPOSER_UPDATE_FLAGS: ""
   COMPOSER_TESTS_ARE_RUNNING: "1"
-  SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT: "1"
 
 jobs:
   tests:
diff --git a/.gitignore b/.gitignore
index aada402fa..0b1fb77c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /composer.phar
 /vendor
 /nbproject
+.phpunit.result.cache
 phpunit.xml
 .vagrant
 Vagrantfile
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c10b24865..dbb5253eb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,6 +16,7 @@
 >
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0"/>
+        <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
         <env name="COMPOSER_TEST_SUITE" value="1"/>
     </php>
     <testsuites>
diff --git a/tests/complete.phpunit.xml b/tests/complete.phpunit.xml
index 14b2de093..e60a38d5b 100644
--- a/tests/complete.phpunit.xml
+++ b/tests/complete.phpunit.xml
@@ -16,6 +16,7 @@
 >
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+        <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
     </php>
     <testsuites>
         <testsuite name="Full Composer Test Suite">