diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
index ea508b63..3839e409 100644
--- a/tests/storage/__init__.py
+++ b/tests/storage/__init__.py
@@ -1,10 +1,13 @@
 import random
+import sys
 import textwrap
 import uuid
 from urllib.parse import quote as urlquote
 from urllib.parse import unquote as urlunquote
 
-import aiostream
+if sys.version_info < (3, 9):
+    import aiostream
+
 import pytest
 import pytest_asyncio
 
diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py
index 76fe8d37..b1a0c49e 100644
--- a/tests/storage/conftest.py
+++ b/tests/storage/conftest.py
@@ -1,11 +1,14 @@
 import asyncio
 import contextlib
 import subprocess
+import sys
 import time
 import uuid
 from typing import Type
 
-import aiostream
+if sys.version_info < (3, 9):
+    import aiostream
+
 import pytest
 import pytest_asyncio
 import requests
diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py
index b97b2cc9..8968d63c 100644
--- a/tests/storage/dav/__init__.py
+++ b/tests/storage/dav/__init__.py
@@ -1,8 +1,12 @@
 import os
+import sys
 import uuid
 
 import aiohttp
-import aiostream
+
+if sys.version_info < (3, 9):
+    import aiostream
+
 import pytest
 
 from tests import assert_item_equals
diff --git a/tests/storage/dav/test_caldav.py b/tests/storage/dav/test_caldav.py
index e68d09b0..966cc7e3 100644
--- a/tests/storage/dav/test_caldav.py
+++ b/tests/storage/dav/test_caldav.py
@@ -1,8 +1,12 @@
 import datetime
+import sys
 from textwrap import dedent
 
 import aiohttp
-import aiostream
+
+if sys.version_info < (3, 9):
+    import aiostream
+
 import pytest
 from aioresponses import aioresponses
 
diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py
index fb90bddf..1df720ab 100644
--- a/tests/storage/test_filesystem.py
+++ b/tests/storage/test_filesystem.py
@@ -1,6 +1,9 @@
 import subprocess
+import sys
+
+if sys.version_info < (3, 9):
+    import aiostream
 
-import aiostream
 import pytest
 
 from vdirsyncer.storage.filesystem import FilesystemStorage
diff --git a/tests/storage/test_http_with_singlefile.py b/tests/storage/test_http_with_singlefile.py
index 7f671d74..74e66886 100644
--- a/tests/storage/test_http_with_singlefile.py
+++ b/tests/storage/test_http_with_singlefile.py
@@ -1,4 +1,7 @@
-import aiostream
+import sys
+
+if sys.version_info < (3, 9):
+    import aiostream
 import pytest
 from aioresponses import CallbackResult
 from aioresponses import aioresponses
diff --git a/tests/unit/cli/test_discover.py b/tests/unit/cli/test_discover.py
index 4c24a387..2af6cc45 100644
--- a/tests/unit/cli/test_discover.py
+++ b/tests/unit/cli/test_discover.py
@@ -1,4 +1,7 @@
-import aiostream
+import sys
+
+if sys.version_info < (3, 9):
+    import aiostream
 import pytest
 
 from vdirsyncer.cli.discover import expand_collections
diff --git a/tests/unit/sync/test_sync.py b/tests/unit/sync/test_sync.py
index 84db2faa..5c814b37 100644
--- a/tests/unit/sync/test_sync.py
+++ b/tests/unit/sync/test_sync.py
@@ -1,7 +1,10 @@
 import asyncio
+import sys
 from copy import deepcopy
 
-import aiostream
+if sys.version_info < (3, 9):
+    import aiostream
+
 import hypothesis.strategies as st
 import pytest
 from hypothesis import assume
diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py
index 3a153bca..bec7eac4 100644
--- a/tests/unit/test_repair.py
+++ b/tests/unit/test_repair.py
@@ -1,4 +1,7 @@
-import aiostream
+import sys
+
+if sys.version_info < (3, 9):
+    import aiostream
 import pytest
 from hypothesis import HealthCheck
 from hypothesis import given
diff --git a/vdirsyncer/cli/discover.py b/vdirsyncer/cli/discover.py
index c28af141..c1a7d091 100644
--- a/vdirsyncer/cli/discover.py
+++ b/vdirsyncer/cli/discover.py
@@ -5,7 +5,9 @@
 import sys
 
 import aiohttp
-import aiostream
+
+if sys.version_info < (3, 9):
+    import aiostream
 
 from .. import exceptions
 from .utils import handle_collection_not_found
diff --git a/vdirsyncer/repair.py b/vdirsyncer/repair.py
index d3e48dcc..503a4c3a 100644
--- a/vdirsyncer/repair.py
+++ b/vdirsyncer/repair.py
@@ -1,7 +1,9 @@
 import logging
+import sys
 from os.path import basename
 
-import aiostream
+if sys.version_info < (3, 9):
+    import aiostream
 
 from .utils import generate_href
 from .utils import href_safe
diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
index 727f685e..4c2f46df 100644
--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -1,5 +1,6 @@
 import datetime
 import logging
+import sys
 import urllib.parse as urlparse
 import xml.etree.ElementTree as etree
 from abc import abstractmethod
@@ -9,7 +10,9 @@
 from typing import Type
 
 import aiohttp
-import aiostream
+
+if sys.version_info < (3, 9):
+    import aiostream
 
 from vdirsyncer.exceptions import Error
 from vdirsyncer.vobject import Item