diff --git a/test/bdd/conftest.py b/test/bdd/conftest.py
index 0cf45835..8949f2cd 100644
--- a/test/bdd/conftest.py
+++ b/test/bdd/conftest.py
@@ -377,8 +377,9 @@ def check_place_missing_lines(db_conn, table, osm_type, osm_id, osm_class):
         assert cur.execute(sql, params).fetchone()[0] == 0
 
 
-def pytest_pycollect_makemodule(module_path, parent):
-    return BddTestCollector.from_parent(parent, path=module_path)
+if pytest.version_tuple >= (8, 0, 0):
+    def pytest_pycollect_makemodule(module_path, parent):
+        return BddTestCollector.from_parent(parent, path=module_path)
 
 
 class BddTestCollector(pytest.Module):
diff --git a/test/bdd/test_api.py b/test/bdd/test_api.py
index 6f0c2fab..0bb763d9 100644
--- a/test/bdd/test_api.py
+++ b/test/bdd/test_api.py
@@ -150,4 +150,8 @@ def parse_api_json_response(api_response, fmt, num):
     return result
 
 
-PYTEST_BDD_SCENARIOS = ['features/api']
+if pytest.version_tuple >= (8, 0, 0):
+    PYTEST_BDD_SCENARIOS = ['features/api']
+else:
+    from pytest_bdd import scenarios
+    scenarios('features/api')
diff --git a/test/bdd/test_db.py b/test/bdd/test_db.py
index 954d9df3..30e1e2bb 100644
--- a/test/bdd/test_db.py
+++ b/test/bdd/test_db.py
@@ -276,4 +276,8 @@ def then_check_interpolation_table_negative(db_conn, oid):
         assert cur.fetchone()[0] == 0
 
 
-PYTEST_BDD_SCENARIOS = ['features/db']
+if pytest.version_tuple >= (8, 0, 0):
+    PYTEST_BDD_SCENARIOS = ['features/db']
+else:
+    from pytest_bdd import scenarios
+    scenarios('features/db')
diff --git a/test/bdd/test_osm2pgsql.py b/test/bdd/test_osm2pgsql.py
index a0637634..75d26f17 100644
--- a/test/bdd/test_osm2pgsql.py
+++ b/test/bdd/test_osm2pgsql.py
@@ -106,4 +106,8 @@ def check_place_content(db_conn, datatable, node_grid, table, exact):
     check_table_content(db_conn, table, datatable, grid=node_grid, exact=bool(exact))
 
 
-PYTEST_BDD_SCENARIOS = ['features/osm2pgsql']
+if pytest.version_tuple >= (8, 0, 0):
+    PYTEST_BDD_SCENARIOS = ['features/osm2pgsql']
+else:
+    from pytest_bdd import scenarios
+    scenarios('features/osm2pgsql')