diff --git a/.ds.baseline b/.ds.baseline
index ae7f12d3e..0d0277bfc 100644
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -249,7 +249,7 @@
         "filename": "tests/app/dao/test_users_dao.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 52,
+        "line_number": 54,
         "is_secret": false
       },
       {
@@ -257,7 +257,7 @@
         "filename": "tests/app/dao/test_users_dao.py",
         "hashed_secret": "f2c57870308dc87f432e5912d4de6f8e322721ba",
         "is_verified": false,
-        "line_number": 176,
+        "line_number": 184,
         "is_secret": false
       }
     ],
@@ -384,5 +384,5 @@
       }
     ]
   },
-  "generated_at": "2024-10-10T21:55:35Z"
+  "generated_at": "2024-10-11T14:53:42Z"
 }
diff --git a/tests/app/dao/test_users_dao.py b/tests/app/dao/test_users_dao.py
index 9c8770913..e5fd8a8c1 100644
--- a/tests/app/dao/test_users_dao.py
+++ b/tests/app/dao/test_users_dao.py
@@ -3,6 +3,7 @@ from datetime import timedelta
 
 import pytest
 from freezegun import freeze_time
+from sqlalchemy import func, select
 from sqlalchemy.exc import DataError
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -55,8 +56,10 @@ def test_create_user(notify_db_session, phone_number, expected_phone_number):
     }
     user = User(**data)
     save_model_user(user, password="password", validated_email_access=True)
-    assert User.query.count() == 1
-    user_query = User.query.first()
+    stmt = select(func.count(User.id))
+    assert db.session.execute(stmt).scalar() == 1
+    stmt = select(User)
+    user_query = db.session.execute(stmt).scalars().first()
     assert user_query.email_address == email
     assert user_query.id == user.id
     assert user_query.mobile_number == expected_phone_number
@@ -68,7 +71,8 @@ def test_get_all_users(notify_db_session):
     create_user(email="1@test.com")
     create_user(email="2@test.com")
 
-    assert User.query.count() == 2
+    stmt = select(func.count(User.id))
+    assert db.session.execute(stmt).scalar() == 2
     assert len(get_user_by_id()) == 2
 
 
@@ -89,9 +93,10 @@ def test_get_user_invalid_id(notify_db_session):
 
 
 def test_delete_users(sample_user):
-    assert User.query.count() == 1
+    stmt = select(func.count(User.id))
+    assert db.session.execute(stmt).scalar() == 1
     delete_model_user(sample_user)
-    assert User.query.count() == 0
+    assert db.session.execute(stmt).scalar() == 0
 
 
 def test_increment_failed_login_should_increment_failed_logins(sample_user):
@@ -127,9 +132,10 @@ def test_get_user_by_email_is_case_insensitive(sample_user):
 def test_should_delete_all_verification_codes_more_than_one_day_old(sample_user):
     make_verify_code(sample_user, age=timedelta(hours=24), code="54321")
     make_verify_code(sample_user, age=timedelta(hours=24), code="54321")
-    assert VerifyCode.query.count() == 2
+    stmt = select(func.count(VerifyCode.id))
+    assert db.session.execute(stmt).scalar() == 2
     delete_codes_older_created_more_than_a_day_ago()
-    assert VerifyCode.query.count() == 0
+    assert db.session.execute(stmt).scalar() == 0
 
 
 def test_should_not_delete_verification_codes_less_than_one_day_old(sample_user):
@@ -137,10 +143,11 @@ def test_should_not_delete_verification_codes_less_than_one_day_old(sample_user)
         sample_user, age=timedelta(hours=23, minutes=59, seconds=59), code="12345"
     )
     make_verify_code(sample_user, age=timedelta(hours=24), code="54321")
-
-    assert VerifyCode.query.count() == 2
+    stmt = select(func.count(VerifyCode))
+    assert db.session.execute(stmt).scalar() == 2
     delete_codes_older_created_more_than_a_day_ago()
-    assert VerifyCode.query.one()._code == "12345"
+    stmt = select(VerifyCode)
+    assert db.session.execute(stmt).scalars().one()._code == "12345"
 
 
 def make_verify_code(user, age=None, expiry_age=None, code="12335", code_used=False):