diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
deleted file mode 100644
index 9eaedbce..00000000
--- a/.github/workflows/bc.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: BC Check
-
-on:
-  pull_request:
-
-jobs:
-  roave-bc-check:
-    name: Roave BC Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da7414e5..eda7dceb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 
     steps:
       - name: Set up PHP
@@ -23,8 +23,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Mimic PHP 8.0
+        run: composer config platform.php 8.0.999
+        if: matrix.php > 8
+
       - name: Install dependencies
-        run: composer update --no-interaction --no-progress --prefer-dist
+        run: composer update --no-interaction --no-progress
 
       - name: Run tests
         run: make test
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b6e0eb24..3c31f9ef 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Download dependencies
         uses: ramsey/composer-install@v1
         with:
-          composer-options: --no-interaction --prefer-dist --optimize-autoloader
+          composer-options: --no-interaction --optimize-autoloader
 
       - name: Start server
         run: php -S 127.0.0.1:10002 tests/Integration/server.php &
diff --git a/.travis.yml b/.travis.yml
index a3219eba..77d260ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,6 @@ matrix:
         - php: 5.5.9
           dist: trusty
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-        - php: 5.5
-          dist: trusty
     fast_finish: true
 
 before_install:
@@ -21,8 +19,8 @@ before_install:
     - if [[ "$TRAVIS_PHP_VERSION" == "hhvm-3.24" ]]; then travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n; fi
 
 install:
-    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]]; then travis_retry composer update --prefer-dist; fi
-    - if [[ "$TRAVIS_PHP_VERSION" == "nightly" ]]; then travis_retry composer update --prefer-dist --ignore-platform-reqs; fi
+    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]]; then travis_retry composer update; fi
+    - if [[ "$TRAVIS_PHP_VERSION" == "nightly" ]]; then travis_retry composer update --ignore-platform-reqs; fi
 
 script:
     - make test