diff --git a/integrationtests/single_tests/test_crawler.py b/integrationtests/single_tests/test_crawler.py
index 1647b8ccc9a61e371a00c563f08fb36bb3bab979..9e5f4905f286ea3fe53d69c88adf4cd9b82c7690 100644
--- a/integrationtests/single_tests/test_crawler.py
+++ b/integrationtests/single_tests/test_crawler.py
@@ -85,7 +85,7 @@ class CrawlerTest(unittest.TestCase):
         for el in [self.exp, self.ana, self.pub, self.rts]:
             try:
                 el.delete()
-            except:
+            except BaseException:
                 pass
 
 
@@ -104,5 +104,5 @@ class CrawlerTestExist(CrawlerTest):
         for el in [self.exp, self.ana, self.pub, self.rts]:
             try:
                 el.delete()
-            except:
+            except BaseException:
                 pass
diff --git a/unittests/test_cache.py b/unittests/test_cache.py
index c1c92330b5fba47b0a19a89913ded43ef59d3197..985ac15ca52a06c6e00c13c6d87adcb8d21f1595 100644
--- a/unittests/test_cache.py
+++ b/unittests/test_cache.py
@@ -37,7 +37,7 @@ class CacheTest(unittest.TestCase):
 
     def test_hash(self):
         ent = db.Record()
-        assert type(Cache.hash_entity(ent)) is str
+        assert isinstance(Cache.hash_entity(ent), str)
         assert (Cache.hash_entity(ent) !=
                 Cache.hash_entity(db.Record().add_parent("lol")))
 
@@ -48,7 +48,7 @@ class CacheTest(unittest.TestCase):
         ent_hash = Cache.hash_entity(ent)
         ent2_hash = Cache.hash_entity(ent2)
         self.cache.insert(ent2_hash, 1235)
-        assert type(self.cache.check_existing(ent2_hash)) is int
+        assert isinstance(self.cache.check_existing(ent2_hash), int)
         assert self.cache.check_existing(ent_hash) is None
 
     def test_hirarchy(self):
diff --git a/unittests/test_read_md_header.py b/unittests/test_read_md_header.py
index 21c641f769958de731962ab0b9f40c670f1abe9c..994f8f16b6158914ff87134f3efd6f157dea6736 100644
--- a/unittests/test_read_md_header.py
+++ b/unittests/test_read_md_header.py
@@ -53,7 +53,7 @@ data:
 ...
 """
         header = get_header(to_file(file_content))
-        assert type(header["data"]) is list
+        assert isinstance(header["data"], list)
         file_content = """
 ---
 data:
@@ -61,4 +61,4 @@ data:
 ...
 """
         header = get_header(to_file(file_content))
-        assert type(header["data"]) is list
+        assert isinstance(header["data"], list)