diff --git a/repoapi/test/test_model_queries.py b/repoapi/test/test_model_queries.py
index d329dac..aedf3b4 100644
--- a/repoapi/test/test_model_queries.py
+++ b/repoapi/test/test_model_queries.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 The Sipwise Team - http://sipwise.com
+# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
@@ -16,6 +16,7 @@ from datetime import datetime
 from datetime import timedelta
 
 from django.utils.dateparse import parse_datetime
+from django.utils.timezone import make_aware
 
 from repoapi.models import JenkinsBuildInfo
 from repoapi.test.base import BaseTest
@@ -79,7 +80,7 @@ class JBIQueriesTestCase(BaseTest):
     def test_purge_release(self):
         prev_count = JenkinsBuildInfo.objects.count()
         jbi = JenkinsBuildInfo.objects.get(pk=1)
-        jbi.date = datetime.now()
+        jbi.date = make_aware(datetime.now())
         jbi.save()
         self.assertEqual(JenkinsBuildInfo.objects.count(), prev_count)
         JenkinsBuildInfo.objects.purge_release(
diff --git a/repoapi/test/test_tasks.py b/repoapi/test/test_tasks.py
index b29a42f..f04f258 100644
--- a/repoapi/test/test_tasks.py
+++ b/repoapi/test/test_tasks.py
@@ -18,6 +18,7 @@ from os.path import join
 from unittest.mock import patch
 
 from django.test import override_settings
+from django.utils.timezone import make_aware
 
 from repoapi import tasks
 from repoapi.conf import settings
@@ -34,7 +35,7 @@ class TasksTestCase(BaseTest):
     def test_purge(self):
         prev_count = JenkinsBuildInfo.objects.count()
         jbi = JenkinsBuildInfo.objects.get(pk=1)
-        jbi.date = datetime.now()
+        jbi.date = make_aware(datetime.now())
         jbi.save()
         self.assertEqual(JenkinsBuildInfo.objects.count(), prev_count)
         tasks.jbi_purge.delay("mr3.1-fake", 3)