diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 41699422..36039595 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -2,9 +2,13 @@ name: testing
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.2
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.2
 
 jobs:
   build:
diff --git a/appveyor.yml b/appveyor.yml
index d35cafe6..db38580a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ image: Visual Studio 2015
 platform: x64
 
 environment:
-    PYTHON: "C:\\Python36-x64"
+    PYTHON: "C:\\Python37-x64"
     DISTUTILS_USE_SDK: "1"
     API_TOKEN:
         secure: VEKn4bYH3QO0ixtQW5ni4Enmn8cS1NlZV246ludBDgQ=
diff --git a/dev-requirements.txt b/dev-requirements.txt
index eba5db79..86cc066f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,8 @@
 -rrequirements.txt
 
-pytest==7.0.0
-flake8==4.0.1
-pytest-timeout==1.4.2
-pytest-aiohttp==0.3.0
+pytest==7.0.1; python_version < '3.7' # last version to support Python 3.6
+pytest==7.1.2; python_version >= '3.7'
+flake8==5.0.4
+pytest-timeout==2.1.0
+pytest-aiohttp==0.3.0; python_version < '3.7'  # last version to support Python 3.6
+pytest-aiohttp==1.0.4; python_version >= '3.7'
diff --git a/gns3server/web/route.py b/gns3server/web/route.py
index d1275250..e788a32c 100644
--- a/gns3server/web/route.py
+++ b/gns3server/web/route.py
@@ -147,7 +147,7 @@ class Route(object):
             else:
                 route = path
 
-            # Compute metadata for the documentation
+            # Compute metadata for the documentation
             if api_version:
                 handler = func.__module__.replace("_handler", "").replace("gns3server.handlers.api.", "")
                 cls._documentation.setdefault(handler, {})
diff --git a/pytest.ini b/pytest.ini
index c1ea2797..a37fdb73 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,4 @@
 [pytest]
+asyncio_mode=auto
 log_level=NOTSET
 ignore=env
\ No newline at end of file
diff --git a/tests/compute/dynamips/test_dynamips_router.py b/tests/compute/dynamips/test_dynamips_router.py
index 3ab250a1..7657422e 100644
--- a/tests/compute/dynamips/test_dynamips_router.py
+++ b/tests/compute/dynamips/test_dynamips_router.py
@@ -18,7 +18,6 @@
 import os
 import uuid
 import pytest
-import asyncio
 
 from gns3server.compute.dynamips.nodes.router import Router
 from gns3server.compute.dynamips.dynamips_error import DynamipsError
diff --git a/tests/compute/test_base_node.py b/tests/compute/test_base_node.py
index 9052a818..d96c67ce 100644
--- a/tests/compute/test_base_node.py
+++ b/tests/compute/test_base_node.py
@@ -18,7 +18,6 @@
 from collections import OrderedDict
 
 import pytest
-import asyncio
 
 from tests.utils import asyncio_patch, AsyncioMagicMock
 
diff --git a/tests/compute/vmware/test_vmware_manager.py b/tests/compute/vmware/test_vmware_manager.py
index a26dbed1..9953d1e8 100644
--- a/tests/compute/vmware/test_vmware_manager.py
+++ b/tests/compute/vmware/test_vmware_manager.py
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 import pytest
 
 from gns3server.compute.vmware import VMware
diff --git a/tests/compute/vmware/test_vmware_vm.py b/tests/compute/vmware/test_vmware_vm.py
index 22bf1d46..d160e245 100644
--- a/tests/compute/vmware/test_vmware_vm.py
+++ b/tests/compute/vmware/test_vmware_vm.py
@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-import asyncio
 
 from gns3server.compute.vmware.vmware_vm import VMwareVM
 from gns3server.compute.vmware import VMware
diff --git a/tests/controller/gns3vm/test_virtualbox_gns3_vm.py b/tests/controller/gns3vm/test_virtualbox_gns3_vm.py
index eb90dce0..eac3bf22 100644
--- a/tests/controller/gns3vm/test_virtualbox_gns3_vm.py
+++ b/tests/controller/gns3vm/test_virtualbox_gns3_vm.py
@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-import asyncio
 
 from tests.utils import asyncio_patch, AsyncioMagicMock
 from gns3server.utils.asyncio import wait_run_in_executor