diff --git a/tests/form_pages/test_all.py b/tests/form_pages/test_all.py
index 4e4a0a5eb..7b5cb24a3 100644
--- a/tests/form_pages/test_all.py
+++ b/tests/form_pages/test_all.py
@@ -4528,7 +4528,7 @@ def test_form_autosave_with_items_field(pub):
     formdata = formdef.data_class().select()[0]
     assert formdata.status == 'draft'
     assert formdef.data_class().select()[0].data['1'] == 'bar'
-    assert formdef.data_class().select()[0].data.get('3') == None
+    assert formdef.data_class().select()[0].data.get('3') is None
 
     resp = resp.forms[0].submit('submit')
     resp.form['f3$element1'].checked = True
@@ -4565,7 +4565,7 @@ def test_form_autosave_with_parameterized_datasource(pub):
     formdata = formdef.data_class().select()[0]
     assert formdata.status == 'draft'
     assert formdef.data_class().select()[0].data['1'] == 'bar'
-    assert formdef.data_class().select()[0].data.get('3') == None
+    assert formdef.data_class().select()[0].data.get('3') is None
 
     resp = resp.forms[0].submit('submit')
     app.post('/test/autosave', params=resp.form.submit_fields())
diff --git a/tests/test_fields.py b/tests/test_fields.py
index f7e832140..3d4d13f1a 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -364,8 +364,8 @@ def test_map():
     assert fields.MapField().get_json_value('42.2;10.2') == {'lat': 42.2, 'lon': 10.2}
     assert fields.MapField().get_json_value('-42.2;10.2') == {'lat': -42.2, 'lon': 10.2}
     assert fields.MapField().get_json_value(' 42.2 ; 10.2 ') == {'lat': 42.2, 'lon': 10.2}
-    assert fields.MapField().get_json_value('') == None
-    assert fields.MapField().get_json_value('foobar') == None
+    assert fields.MapField().get_json_value('') is None
+    assert fields.MapField().get_json_value('foobar') is None
 
 
 def test_item_render():
diff --git a/tests/test_saml2utils.py b/tests/test_saml2utils.py
index 322b87aaa..1d512f4d8 100644
--- a/tests/test_saml2utils.py
+++ b/tests/test_saml2utils.py
@@ -30,7 +30,7 @@ def test_metadata_generation():
         },
         provider_id='provider_id_1',
     )
-    assert meta != None
+    assert meta is not None
     content = meta.get_saml2_metadata(pkey, '', True, True)
     assert isinstance(content, str) and content != ''
     assert 'EntityDescriptor' in content
diff --git a/tests/test_widgets.py b/tests/test_widgets.py
index aabe239ff..016c76838 100644
--- a/tests/test_widgets.py
+++ b/tests/test_widgets.py
@@ -655,7 +655,7 @@ def test_computed_expression_widget():
 
     widget = ComputedExpressionWidget('test')
     mock_form_submission(req, widget, {'test$value_text': '', 'test$type': ['text']})
-    assert widget.parse() == None
+    assert widget.parse() is None
     assert not widget.has_error()
 
     # python value left empty
diff --git a/tests/test_workflow_import.py b/tests/test_workflow_import.py
index 865f539ca..455e1fb4f 100644
--- a/tests/test_workflow_import.py
+++ b/tests/test_workflow_import.py
@@ -500,7 +500,7 @@ def test_register_comment_to(pub):
     add_to_journal2.to = [role.id]
     st1.items.append(add_to_journal2)
     add_to_journal2.parent = st1
-    assert wf.possible_status[0].items[0].to == None
+    assert wf.possible_status[0].items[0].to is None
     assert wf.possible_status[0].items[1].to == [role.id]
 
     xml_root = wf.export_to_xml()
diff --git a/tests/test_workflows.py b/tests/test_workflows.py
index ddcfb4a33..06420f2d7 100644
--- a/tests/test_workflows.py
+++ b/tests/test_workflows.py
@@ -4097,7 +4097,7 @@ def test_profile(two_pubs):
         if date_value not in (None, ''):  # bad value : do nothing
             assert User.get(user.id).form_data.get('4').tm_year == year
         else:  # empty value : empty field
-            assert User.get(user.id).form_data.get('4') == None
+            assert User.get(user.id).form_data.get('4') is None
 
         with mock.patch('wcs.wf.profile.http_patch_request') as http_patch_request:
             http_patch_request.return_value = (None, 200, '', None)
@@ -4158,7 +4158,7 @@ def test_set_backoffice_field(http_requests, two_pubs):
 
     item.perform(formdata)
     formdata = formdef.data_class().get(formdata.id)
-    assert formdata.data.get('bo1') == None
+    assert formdata.data.get('bo1') is None
 
     item.fields = [{'field_id': 'bo1', 'value': '=form_var_string'}]
     item.perform(formdata)
@@ -4325,7 +4325,7 @@ def test_set_backoffice_field_file(http_requests, two_pubs):
     two_pubs.substitutions.feed(formdata)
     item.perform(formdata)
     formdata = formdef.data_class().get(formdata.id)
-    assert formdata.data['bo1'] == None
+    assert formdata.data['bo1'] is None
 
     # store a PiclableUpload
     upload = PicklableUpload('test.jpeg', 'image/jpeg')
@@ -5275,11 +5275,11 @@ def test_redirect_to_url(pub):
 
     item.url = '[if-any nada]https://www.example.net/[end]'
     pub.substitutions.feed(formdata)
-    assert item.perform(formdata) == None
+    assert item.perform(formdata) is None
 
     item.url = '{% if nada %}https://www.example.net/{% endif %}'
     pub.substitutions.feed(formdata)
-    assert item.perform(formdata) == None
+    assert item.perform(formdata) is None
 
 
 def test_workflow_jump_condition_migration(pub):