diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7decd3eed..e9fb7bc62 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,7 +27,7 @@ jobs:
         run: tox -v -e py-apicheck -- -v
   #################### Unittests ####################
   unittest:
-    # needs: lint
+    needs: lint
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -45,30 +45,27 @@ jobs:
       - name: Install dependencies
         run: pip install --upgrade pip setuptools wheel tox tox-docker
       - name: Run unittest
-        run: tox -v -e ${{ matrix.python-version }}-unit -- -v
-#  #################### Integration tests ####################
-#  integration:
-#    needs: [lint, unittest]
-#    runs-on: ubuntu-latest
-#    strategy:
-#      matrix:
-#        python-version: [3.6,3.7,3.8,pypy3]
-#    steps:
-#      - name: Check out code from GitHub
-#        uses: actions/checkout@v2.3.4
-#      - name: Build rabbitmq:tls container
-#        run: docker build -t rabbitmq:tls .
-#      - name: Set up Python ${{ matrix.python-version }}
-#        id: python
-#        uses: actions/setup-python@v2.2.1
-#        with:
-#          python-version: ${{ matrix.python-version }}
-#      - name: Install dependencies
-#        run: pip install --upgrade pip setuptools wheel tox tox-docker
-#      - name: Run integration tests
-#        run: tox -v -e ${{ matrix.python-version }}-integration-rabbitmq -- -v
-#      - name: Run integration tests with speedups enabled
-#        run: |
-#          CELERY_ENABLE_SPEEDUPS=1 python setup.py develop
-#          tox -v -e ${{ matrix.python-version }}-integration-rabbitmq -- -v
-#        if: ${{ matrix.python-version != 'pypy3'}}
+        run: tox -v -e ${{ matrix.python-version }}-linux-unit -- -v
+  #################### Integration tests ####################
+  integration:
+    needs: [lint, unittest]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6,3.7,3.8,pypy3]
+    steps:
+      - name: Install system packages
+        run: sudo apt-get install libcurl4-openssl-dev libssl-dev
+      - name: Check out code from GitHub
+        uses: actions/checkout@v2.3.4
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v2.2.1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: pip install --upgrade pip setuptools wheel tox tox-docker
+      - name: Run AMQP integration tests
+        run: tox -v -e ${{ matrix.python-version }}-linux-integration-py-amqp -- -v
+      - name: Run redis integration tests
+        run: tox -v -e ${{ matrix.python-version }}-linux-integration-py-redis -- -v
diff --git a/appveyor.yml b/appveyor.yml
index 938589209..b53c5efc0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,29 +6,29 @@ environment:
       WITH_COMPILER: "cmd /E:ON /V:ON /C .\\extra\\appveyor\\run_with_compiler.cmd"
 
   matrix:
-    - TOXENV: "3.6"
+    - TOXENV: "3.6-windows-unit"
       TOX_APPVEYOR_X64: 0
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "32"
 
-    - TOXENV: "3.7-windows"
+    - TOXENV: "3.7-windows-unit"
       TOX_APPVEYOR_X64: 0
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "32"
 
-    - TOXENV: "3.6"
+    - TOXENV: "3.6-windows-unit"
       TOX_APPVEYOR_X64: 1
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "64"
       WINDOWS_SDK_VERSION: "v7.1"
 
-    - TOXENV: "3.7-windows"
+    - TOXENV: "3.7-windows-unit"
       TOX_APPVEYOR_X64: 1
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
       WINDOWS_SDK_VERSION: "v7.1"
 
-    - TOXENV: "3.8-windows"
+    - TOXENV: "3.8-windows-unit"
       TOX_APPVEYOR_X64: 1
       PYTHON_VERSION: "3.8"
       PYTHON_ARCH: "64"
diff --git a/requirements/test-ci.txt b/requirements/test-ci.txt
index 1c21ff5dd..7a52f3bfe 100644
--- a/requirements/test-ci.txt
+++ b/requirements/test-ci.txt
@@ -8,7 +8,6 @@ codecov
 -r extras/azurestoragequeues.txt
 -r extras/sqs.txt
 -r extras/consul.txt
-# -r extras/librabbitmq.txt
 -r extras/zookeeper.txt
 -r extras/brotli.txt
 -r extras/zstd.txt
diff --git a/tox.ini b/tox.ini
index 136faae4f..11ed7aa73 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
     {pypy3,3.6,3.7,3.8}-unit
-    {pypy3,3.6,3.7,3.8}-integration-py-amqp
-    {pypy3,3.6,3.7,3.8}-integration-redis
+    {pypy3,3.6,3.7,3.8}-linux-integration-py-amqp
+    {pypy3,3.6,3.7,3.8}-linux-integration-redis
     flake8
     flakeplus
     apicheck
@@ -19,8 +19,8 @@ deps=
     -r{toxinidir}/requirements/dev.txt
     apicheck,pypy3,3.6,3.7,3.8: -r{toxinidir}/requirements/default.txt
     apicheck,pypy3,3.6,3.7,3.8: -r{toxinidir}/requirements/test.txt
-    apicheck,pypy3,3.6,3.7,3.8: -r{toxinidir}/requirements/test-ci.txt
-    3.7-windows: -r{toxinidir}/requirements/test-ci-windows.txt
+    apicheck,pypy3,3.6,3.7-linux,3.8-linux: -r{toxinidir}/requirements/test-ci.txt
+    3.7-windows,3.8-windows: -r{toxinidir}/requirements/test-ci-windows.txt
     apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt