diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 02e2f68d..720d5b83 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/gns3server/web/web_server.py b/gns3server/web/web_server.py
index 8971f587..5d58ffcf 100644
--- a/gns3server/web/web_server.py
+++ b/gns3server/web/web_server.py
@@ -83,7 +83,7 @@ class WebServer:
     def _run_application(self, handler, ssl_context=None):
         try:
             srv = self._loop.create_server(handler, self._host, self._port, ssl=ssl_context)
-            self._server, startup_res = self._loop.run_until_complete(asyncio.gather(srv, self._app.startup(), loop=self._loop))
+            self._server, startup_res = self._loop.run_until_complete(asyncio.gather(srv, self._app.startup()))
         except (RuntimeError, OSError, asyncio.CancelledError) as e:
             log.critical("Could not start the server: {}".format(e))
             return False
diff --git a/setup.py b/setup.py
index e1f3f439..caf8f125 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,7 @@ setup(
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
 )